From 748fddb85bd99afe1b3515353841a96f0b35188e Mon Sep 17 00:00:00 2001 From: JT Smith Date: Wed, 31 Aug 2005 20:15:55 +0000 Subject: [PATCH] - Fixed a few bugs in the new form system related to UI levels and hidden fields. - fix [ 1275024 ] Can not edit layout on 6.7.2 - fix [ 1262235 ] sql report form params --- docs/changelog/6.x.x.txt | 3 +++ lib/WebGUI/Asset.pm | 17 +++++++++-------- lib/WebGUI/Asset/Shortcut.pm | 5 +++-- lib/WebGUI/Asset/Wobject.pm | 11 ++++------- lib/WebGUI/Asset/Wobject/SQLReport.pm | 4 ++-- lib/WebGUI/AssetBranch.pm | 19 ++++++++++--------- lib/WebGUI/Form/DynamicField.pm | 7 ++----- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 5414d6902..e44dee37a 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -13,6 +13,9 @@ - fix [ 1276449 ] 6.7.1 content invisible after edit by content manager - Fixed a few bugs in the new form system related to UI levels and hidden fields. + - fix [ 1275024 ] Can not edit layout on 6.7.2 + - fix [ 1262235 ] sql report form params + 6.7.2 diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 5e41226b2..ac758955e 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -637,14 +637,15 @@ sub getEditForm { if($fieldType eq "selectList") { $options = {"", WebGUI::International::get("Select...","Asset")}; } - $tabform->getTab("meta")->dynamicField($fieldType, - -name=>"metadata_".$meta->{$field}{fieldId}, - -label=>$meta->{$field}{fieldName}, - -uiLevel=>5, - -value=>$meta->{$field}{value}, - -extras=>qq/title="$meta->{$field}{description}"/, - -possibleValues=>$meta->{$field}{possibleValues}, - -options=>$options + $tabform->getTab("meta")->dynamicField( + name=>"metadata_".$meta->{$field}{fieldId}, + label=>$meta->{$field}{fieldName}, + uiLevel=>5, + value=>$meta->{$field}{value}, + extras=>qq/title="$meta->{$field}{description}"/, + possibleValues=>$meta->{$field}{possibleValues}, + options=>$options, + fieldType=>$fieldType ); } if (WebGUI::Grouping::isInGroup(3)) { diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 915d7f1f3..fe8a7e4d3 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -460,12 +460,13 @@ sub _drawQueryBuilder { }); # The value select field my $valFieldName = "val_field".$i; - my $valueField = WebGUI::Form::dynamicField($fieldType, { + my $valueField = WebGUI::Form::dynamicField( + fieldType=>$fieldType, name=>$valFieldName, uiLevel=>5, extras=>qq/title="$fields->{$field}{description}" class="qbselect"/, possibleValues=>$fields->{$field}{possibleValues}, - }); + ); # An empty row $output .= qq| diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm index 6b4281151..b2d1ee9cb 100644 --- a/lib/WebGUI/Asset/Wobject.pm +++ b/lib/WebGUI/Asset/Wobject.pm @@ -108,8 +108,7 @@ sub definition { tab=>"display", label=>WebGUI::International::get(1073,'Wobject'), hoverHelp=>WebGUI::International::get('1073 description','Wobject'), - namespace=>'style', - afterEdit=>'op=editPage;npp='.$session{form}{npp} + namespace=>'style' }, printableStyleTemplateId=>{ fieldType=>'template', @@ -117,8 +116,7 @@ sub definition { tab=>"display", label=>WebGUI::International::get(1079,'Wobject'), hoverHelp=>WebGUI::International::get('1079 description','Wobject'), - namespace=>'style', - afterEdit=>'op=editPage;npp='.$session{form}{npp} + namespace=>'style' } } }); @@ -255,12 +253,11 @@ sub getEditForm { foreach my $fieldname (keys %{$properties}) { my %params; foreach my $key (keys %{$properties->{$fieldname}}) { - next if ($key eq "tab" || $key eq "fieldType"); - $params{$key} = $properties->{$fieldname}{$key} + next if ($key eq "tab"); + $params{$key} = $properties->{$fieldname}{$key}; } $params{value} = $self->getValue($fieldname); $params{name} = $fieldname; - $params{fieldType} = $properties->{$fieldname}{fieldType}; my $tab = $properties->{$fieldname}{tab} || "properties"; $tabform->getTab($tab)->dynamicField(%params); } diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm index ec8d4b13a..7df5e74d9 100644 --- a/lib/WebGUI/Asset/Wobject/SQLReport.pm +++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm @@ -284,9 +284,9 @@ sub _parsePlaceholderParams { my $params = shift; my @placeholderParams; foreach my $row (split(/\n/,$params)) { - next unless $row ne ""; + chop($row) if ($row =~ m/\s+$/); + next if ($row =~ /^\s*$/); my ($type,$field) = split(/:/,$row); - chop($field); my $param; if($type =~ /^form/) { $param = $session{form}{$field}; diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm index 4b01312b5..7e2b10ae5 100644 --- a/lib/WebGUI/AssetBranch.pm +++ b/lib/WebGUI/AssetBranch.pm @@ -264,15 +264,16 @@ sub www_editBranch { if($fieldType eq "selectList") { $options = {"", WebGUI::International::get("Select...","Asset")}; } - $tabform->getTab("meta")->dynamicField($fieldType, - -name=>"metadata_".$meta->{$field}{fieldId}, - -label=>$meta->{$field}{fieldName}, - -uiLevel=>5, - -value=>$meta->{$field}{value}, - -extras=>qq/title="$meta->{$field}{description}"/, - -possibleValues=>$meta->{$field}{possibleValues}, - -options=>$options, - -subtext=>'
'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_metadata_".$meta->{$field}{fieldId}}) + $tabform->getTab("meta")->dynamicField( + name=>"metadata_".$meta->{$field}{fieldId}, + label=>$meta->{$field}{fieldName}, + uiLevel=>5, + value=>$meta->{$field}{value}, + extras=>qq/title="$meta->{$field}{description}"/, + possibleValues=>$meta->{$field}{possibleValues}, + options=>$options, + subtext=>'
'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_metadata_".$meta->{$field}{fieldId}}), + fieldType=>$fieldType ); } } diff --git a/lib/WebGUI/Form/DynamicField.pm b/lib/WebGUI/Form/DynamicField.pm index e043ad4f6..da13db158 100644 --- a/lib/WebGUI/Form/DynamicField.pm +++ b/lib/WebGUI/Form/DynamicField.pm @@ -94,11 +94,8 @@ The normal params you'd pass in to the field. Included in this list must be one sub new { my $class = shift; - my $self = $class->SUPER::new(@_); - my $param = {}; - foreach my $key (keys %{$self}) { - $param->{$key} = $self->{$key}; - } + my %raw = @_; + my $param = \%raw; my $fieldType = ucfirst($param->{fieldType}); delete $param->{fieldType}; # Set options for fields that use a list.