diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 747eb02da..36d395ca2 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,5 +1,6 @@ 7.9.8 - fixed #11651: First Day of Week is a string... + - fixed #11656: Thingy: Select list fields are not sorted properly 7.9.7 - added #11571: Allow return from photo edit view to gallery edit view diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm index ed2b8c692..d904e2591 100644 --- a/lib/WebGUI/Asset/Wobject/Thingy.pm +++ b/lib/WebGUI/Asset/Wobject/Thingy.pm @@ -1049,20 +1049,8 @@ sub getFormPlugin { eval { WebGUI::Pluggable::load($class) }; if ($class->isa('WebGUI::Form::List')) { delete $param{size}; - my $values = WebGUI::Operation::Shared::secureEval($session,$data->{possibleValues}); - if (ref $values eq 'HASH') { - $param{options} = $values; - } - else{ - my %options; - tie %options, 'Tie::IxHash'; - foreach (split(/\n/x, $data->{possibleValues})) { - s/\s+$//x; # remove trailing spaces - $options{$_} = $_; - } - $param{options} = \%options; - } + $param{options} = $values; } if ($data->{fieldType} eq "YesNo") { diff --git a/lib/WebGUI/i18n/English/Asset_Thingy.pm b/lib/WebGUI/i18n/English/Asset_Thingy.pm index 5a8468cea..a52ae84f6 100644 --- a/lib/WebGUI/i18n/English/Asset_Thingy.pm +++ b/lib/WebGUI/i18n/English/Asset_Thingy.pm @@ -584,14 +584,12 @@ you wish to appear, one per line.

If you want a different label for a value, the possible values list has to be formatted as follows:
-{
-   "key1"=>"value1",
-   "key2"=>"value2",
-   "key3"=>"value3"
+   key1|value1
+   key2|value2
+   key3|value3
    ...
-}
 
-Braces, quotes and all. You simply replace "key1"/"value1" with your own name/value pairs}, +Simply replace "key1"/"value1" with your own name/value pairs}, lastUpdated => 1223372150, },