diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 261682d27..63d8fe7ce 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.7.9 + - fixed: Reverted bugfix for 10409 and changed the hover help to reflect the correct way to build list-type form controls in the MetaData. 7.7.8 - fixed: Basic Auth doesn't work if password contains colon (Arjan Widlak, diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 78440d86d..a05f310a2 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -961,7 +961,7 @@ sub getEditForm { my $meta = $self->getMetaDataFields(); foreach my $field (keys %$meta) { my $fieldType = $meta->{$field}{fieldType} || "text"; - my $options = WebGUI::Operation::Shared::secureEval($session,$meta->{$field}{possibleValues}); + my $options = $meta->{$field}{possibleValues}; # Add a "Select..." option on top of a select list to prevent from # saving the value on top of the list when no choice is made. if("\l$fieldType" eq "selectBox") { diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 87a7231a4..ec93ba396 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -90,7 +90,7 @@ sub _drawQueryBuilder { }); # The value select field my $valFieldName = "val_field".$i; - my $options = WebGUI::Operation::Shared::secureEval($session,$fields->{$field}{possibleValues}); + my $options = $session,$fields->{$field}{possibleValues}; my $valueField = WebGUI::Form::dynamicField($session, fieldType=>$fieldType, name=>$valFieldName, diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm index b6193467e..e26d5f6ec 100644 --- a/lib/WebGUI/i18n/English/Asset.pm +++ b/lib/WebGUI/i18n/English/Asset.pm @@ -578,15 +578,16 @@ 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"
-   ...
-}
+label1\|value1
+label2\|value2
+label3\|value3
+value4
+...
 
-Braces, quotes and all. You simply replace "key1"/"value1" with your own name/value pairs|, - lastUpdated => 1213247476, +With a \| character separating the label and value. Do not put spaces before or after the \|. Also, note +that you can mix lines with different labels with lines with the same label.
+If you are building a selectBox, a Select entry will automatically be added to the list of options.|, + lastUpdated => 1243611956, }, 'metadata edit property' => {