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

updating comment in select list generator as now sorting all lists, even hard-coded ones in edit configuration template

Browse source
This commit is contained in:
hjkhjk54 2011-12-08 22:19:00 +00:00
parent cf31ff4548
commit 6c9f87b163
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SelectListGeneratorVTwo.java
View file

@ -64,7 +64,7 @@ public class SelectListGeneratorVTwo {
FieldVTwo.OptionsType optionsType = field.getOptionsType(); FieldVTwo.OptionsType optionsType = field.getOptionsType();
String vclassUri = null; String vclassUri = null;
switch (optionsType){ switch (optionsType){
case HARDCODED_LITERALS: // not auto-sorted, and empty values not removed or replaced case HARDCODED_LITERALS: // originally not auto-sorted but sorted now, and empty values not removed or replaced
List<List<String>> hardcodedLiteralOptions = field.getLiteralOptions(); List<List<String>> hardcodedLiteralOptions = field.getLiteralOptions();
if (hardcodedLiteralOptions==null) { if (hardcodedLiteralOptions==null) {
log.error("no literalOptions List found for field \""+fieldName+"\" in SelectListGenerator.getOptions() when OptionsType HARDCODED_LITERALS specified"); log.error("no literalOptions List found for field \""+fieldName+"\" in SelectListGenerator.getOptions() when OptionsType HARDCODED_LITERALS specified");

5
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
View file

@ -104,10 +104,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
continue; continue;
} }
Map<String, String> optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf); Map<String, String> optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf);
//Sort options map if not hardcoded literals optionsMap = SelectListGeneratorVTwo.getSortedMap(optionsMap);
if(field.getOptionsType()!=FieldVTwo.OptionsType.HARDCODED_LITERALS) {
optionsMap = SelectListGeneratorVTwo.getSortedMap(optionsMap);
}
pageData.put(fieldName, optionsMap); pageData.put(fieldName, optionsMap);
} }
} }