From 6c9f87b163513a959dce8471c375c780303f0ddb Mon Sep 17 00:00:00 2001 From: hjkhjk54 Date: Thu, 8 Dec 2011 22:19:00 +0000 Subject: [PATCH] updating comment in select list generator as now sorting all lists, even hard-coded ones in edit configuration template --- .../webapp/edit/n3editing/VTwo/SelectListGeneratorVTwo.java | 2 +- .../templatemodels/edit/EditConfigurationTemplateModel.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SelectListGeneratorVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SelectListGeneratorVTwo.java index dd4a321ef..187d13fd6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SelectListGeneratorVTwo.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SelectListGeneratorVTwo.java @@ -64,7 +64,7 @@ public class SelectListGeneratorVTwo { FieldVTwo.OptionsType optionsType = field.getOptionsType(); String vclassUri = null; 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> hardcodedLiteralOptions = field.getLiteralOptions(); if (hardcodedLiteralOptions==null) { log.error("no literalOptions List found for field \""+fieldName+"\" in SelectListGenerator.getOptions() when OptionsType HARDCODED_LITERALS specified"); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java index a39624d2a..e5ce99b17 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java @@ -104,10 +104,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel { continue; } Map optionsMap = SelectListGeneratorVTwo.getOptions(editConfig, fieldName, wdf); - //Sort options map if not hardcoded literals - if(field.getOptionsType()!=FieldVTwo.OptionsType.HARDCODED_LITERALS) { - optionsMap = SelectListGeneratorVTwo.getSortedMap(optionsMap); - } + optionsMap = SelectListGeneratorVTwo.getSortedMap(optionsMap); pageData.put(fieldName, optionsMap); } }