oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert previous bugfix for MetaData list type form controls, and change the

Browse source 
hoverhelp instead.
This commit is contained in:
Colin Kuskie 2009-05-29 15:37:16 +00:00
parent 26142d4730
commit 91694a2e97
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,4 +1,5 @@
7.7.9 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 7.7.8
- fixed: Basic Auth doesn't work if password contains colon (Arjan Widlak, - fixed: Basic Auth doesn't work if password contains colon (Arjan Widlak,

2
lib/WebGUI/Asset.pm
View file

@ -961,7 +961,7 @@ sub getEditForm {
my $meta = $self->getMetaDataFields(); my $meta = $self->getMetaDataFields();
foreach my $field (keys %$meta) { foreach my $field (keys %$meta) {
my $fieldType = $meta->{$field}{fieldType} || "text"; 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 # 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. # saving the value on top of the list when no choice is made.
if("\l$fieldType" eq "selectBox") { if("\l$fieldType" eq "selectBox") {

2
lib/WebGUI/Asset/Shortcut.pm
View file

@ -90,7 +90,7 @@ sub _drawQueryBuilder {
}); });
# The value select field # The value select field
my $valFieldName = "val_field".$i; 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, my $valueField = WebGUI::Form::dynamicField($session,
fieldType=>$fieldType, fieldType=>$fieldType,
name=>$valFieldName, name=>$valFieldName,

17
lib/WebGUI/i18n/English/Asset.pm
View file

@ -578,15 +578,16 @@ you wish to appear, one per line.<br />
<br />If you want a different label for a value, the possible values list has to be <br />If you want a different label for a value, the possible values list has to be
formatted as follows: formatted as follows:
<pre> <pre>
&#123; label1\|value1
"key1"=>"value1", label2\|value2
"key2"=>"value2", label3\|value3
"key3"=>"value3" value4
... ...
&#125;
</pre> </pre>
Braces, quotes and all. You simply replace "key1"/"value1" with your own name/value pairs|, With a \| character separating the label and value. Do not put spaces before or after the \|. Also, note
lastUpdated => 1213247476, that you can mix lines with different labels with lines with the same label.<br />
If you are building a selectBox, a Select entry will automatically be added to the list of options.|,
lastUpdated => 1243611956,
}, },
'metadata edit property' => { 'metadata edit property' => {