litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3521 changed individual control panel to use an ungrouped dropdown of classes

Browse source
This commit is contained in:
brianjlowe 2011-12-16 19:13:53 +00:00
parent 69a8deee4d
commit 555d32bb91
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
View file

@ -130,7 +130,7 @@ public class EntityEditController extends BaseEditController {
request.setAttribute("epo", epo); request.setAttribute("epo", epo);
FormObject foo = new FormObject(); FormObject foo = new FormObject();
HashMap OptionMap = new HashMap(); HashMap<String, List<Option>> OptionMap = new HashMap<String, List<Option>>();
request.setAttribute("types",ent.getVClasses(false)); // we're displaying all assertions, including indirect types request.setAttribute("types",ent.getVClasses(false)); // we're displaying all assertions, including indirect types
@ -149,17 +149,10 @@ public class EntityEditController extends BaseEditController {
log.error(e, e); log.error(e, e);
} }
List classGroups = vreq.getFullWebappDaoFactory().getVClassGroupDao().getPublicGroupsWithVClasses(true,true,false); // order by displayRank, include uninstantiated classes, don't count the individuals
Iterator classGroupIt = classGroups.iterator();
ListOrderedMap optGroupMap = new ListOrderedMap();
while (classGroupIt.hasNext()) {
VClassGroup group = (VClassGroup)classGroupIt.next();
List classes = group.getVitroClassList();
optGroupMap.put(group.getPublicName(),FormUtils.makeOptionListFromBeans(classes,"URI","PickListName",ent.getVClassURI(),null,false));
//mixes group names with classes:optGroupMap.put(group.getPublicName(),FormUtils.makeVClassOptionList(getFullWebappDaoFactory(),ent.getVClassURI()));
}
try{ try{
OptionMap.put("VClassURI", optGroupMap); OptionMap.put("VClassURI", FormUtils.makeOptionListFromBeans(
vreq.getFullWebappDaoFactory().getVClassDao().getAllVclasses(),
"URI", "PickListName", ent.getVClassURI(), null, false));
} catch (Exception e) { } catch (Exception e) {
log.error(e, e); log.error(e, e);
} }