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

merging r10020 to the trunk

Browse source
This commit is contained in:
tworrall 2012-08-28 17:01:34 +00:00
parent 3d2188ec66
commit 9fd7540e5e
1 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
View file

@ -132,7 +132,7 @@ public class VclassRetryController extends BaseEditController {
try { try {
VClassGroupDao vcgDao = request.getFullWebappDaoFactory().getVClassGroupDao(); VClassGroupDao vcgDao = request.getFullWebappDaoFactory().getVClassGroupDao();
List classGroupOptionList = FormUtils.makeOptionListFromBeans(vcgDao.getPublicGroupsWithVClasses(),"URI","PublicName",vclassForEditing.getGroupURI(),null,(vclassForEditing.getGroupURI()!=null && !(vclassForEditing.getGroupURI().equals("")))); List classGroupOptionList = FormUtils.makeOptionListFromBeans(vcgDao.getPublicGroupsWithVClasses(),"URI","PublicName",vclassForEditing.getGroupURI(),null,(vclassForEditing.getGroupURI()!=null && !(vclassForEditing.getGroupURI().equals(""))));
classGroupOptionList.add(new Option("", "none", ("update".equals(action) && (vclassForEditing.getGroupURI()==null || vclassForEditing.getGroupURI().equals(""))))); classGroupOptionList.add(0,new Option("", "none", ("update".equals(action) && (vclassForEditing.getGroupURI()==null || vclassForEditing.getGroupURI().equals("")))));
optionMap.put("GroupURI", classGroupOptionList); optionMap.put("GroupURI", classGroupOptionList);
} catch (Exception e) { } catch (Exception e) {