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

- Fixed a few bugs in the new form system related to UI levels and hidden

Browse source 
fields.
 - fix [ 1275024 ] Can not edit layout on 6.7.2
 - fix [ 1262235 ] sql report form params
This commit is contained in:
JT Smith 2005-08-31 20:15:55 +00:00
parent c687487df1
commit 748fddb85b
7 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/6.x.x.txt
View file

@ -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

17
lib/WebGUI/Asset.pm
View file

@ -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)) {

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

@ -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|
<tr>

11
lib/WebGUI/Asset/Wobject.pm
View file

@ -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);
}

4
lib/WebGUI/Asset/Wobject/SQLReport.pm
View file

@ -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};

19
lib/WebGUI/AssetBranch.pm
View file

@ -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=>'<br />'.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=>'<br />'.WebGUI::International::get("change","Asset").' '.WebGUI::Form::yesNo({name=>"change_metadata_".$meta->{$field}{fieldId}}),
fieldType=>$fieldType
);
}
}

7
lib/WebGUI/Form/DynamicField.pm
View file

@ -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.