diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 9d5621b85..a89a517a5 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -6,6 +6,7 @@ - fixed #11373: Problem creating FilePump bundles - fixed #11374: USPS shipping drivers take 3 minutes to timeout - fixed #11044: Optionally include hidden pages in sitemap.xml + - fixed #11379: Certain fields in some Assets cannot be overridden in the config file 7.8.10 - fixed #11332: Pagination in webgui.org forum urls diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm index 2a8a2f987..e8371b14f 100644 --- a/lib/WebGUI/Asset/File/Image.pm +++ b/lib/WebGUI/Asset/File/Image.pm @@ -152,54 +152,54 @@ Returns the TabForm object that will be used in generating the edit page for thi =cut sub getEditForm { - my $self = shift; - my $tabform = $self->SUPER::getEditForm(); + my $self = shift; + my $tabform = $self->SUPER::getEditForm(); # Add the fields defined locally and apply any overrides from the config file - my $i18n = WebGUI::International->new($self->session,"Asset_Image"); + my $i18n = WebGUI::International->new($self->session,"Asset_Image"); - tie my %extraFields, "Tie::IxHash"; + tie my %extraFields, "Tie::IxHash"; - my $extraFields = { - thumbnailSize => { - fieldType=>"integer", - -name=>"thumbnailSize", - -label=>$i18n->get('thumbnail size'), - -hoverHelp=>$i18n->get('Thumbnail size description'), - -value=>$self->getValue("thumbnailSize"), - }, - parameters => { - fieldType=>"textarea", - -name=>"parameters", - -label=>$i18n->get('parameters'), - -hoverHelp=>$i18n->get('Parameters description'), - -value=>$self->getValue("parameters") - }, - }; + my $extraFields = { + thumbnailSize => { + fieldType => "integer", + name => "thumbnailSize", + label => $i18n->get('thumbnail size'), + hoverHelp => $i18n->get('Thumbnail size description'), + value => $self->getValue("thumbnailSize"), + }, + parameters => { + fieldType => "textarea", + name => "parameters", + label => $i18n->get('parameters'), + hoverHelp => $i18n->get('Parameters description'), + value => $self->getValue("parameters"), + }, + }; - if ($self->get("filename") ne "") { + if ($self->get("filename") ne "") { my ($x, $y) = $self->getStorageLocation->getSizeInPixels($self->get("filename")); $extraFields->{thumbnail} = { - fieldType=>"readOnly", - -label=>$i18n->get('thumbnail'), - -hoverHelp=>$i18n->get('Thumbnail description'), - -value=>'thumbnail' + fieldType => "readOnly", + label => $i18n->get('thumbnail'), + hoverHelp => $i18n->get('Thumbnail description'), + value => 'thumbnail' }; $extraFields->{imageSize} = { - fieldType=>"readOnly", - -label=>$i18n->get('image size'), - -value=>$x.' x '.$y, + fieldType => "readOnly", + label => $i18n->get('image size'), + value => $x.' x '.$y, }; - } + } - my $overrides = $self->session->config->get("assets/".$self->get("className")); + my $overrides = $self->session->config->get("assets/".$self->get("className")); - foreach my $fieldName (keys %{$extraFields}) { - $self->setupFormField($tabform, $fieldName, $extraFields, $overrides); - } + foreach my $fieldName (keys %{$extraFields}) { + $self->setupFormField($tabform, $fieldName, $extraFields, $overrides); + } - return $tabform; + return $tabform; } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm index d1a709944..0c7fefdd4 100644 --- a/lib/WebGUI/Asset/Wobject/Layout.pm +++ b/lib/WebGUI/Asset/Wobject/Layout.pm @@ -149,29 +149,30 @@ sub getEditForm { tie my %assetOrder, "Tie::IxHash"; %assetOrder = ( - "asc" =>$i18n->get("asset order asc"), - "desc" =>$i18n->get("asset order desc"), + "asc" => $i18n->get("asset order asc"), + "desc" => $i18n->get("asset order desc"), ); - $extraFields{assetOrder} = { + $extraFields{assetOrder} = { tab => 'display', fieldType => 'selectBox', - -name => 'assetOrder', - -label => $i18n->get('asset order label'), - -hoverHelp => $i18n->get('asset order hoverHelp'), - -value => $self->getValue('assetOrder'), - -options => \%assetOrder, - }; + name => 'assetOrder', + label => $i18n->get('asset order label'), + hoverHelp => $i18n->get('asset order hoverHelp'), + value => $self->getValue('assetOrder'), + options => \%assetOrder, + }; if ($self->get("assetId") eq "new") { - $extraFields{whatNext} = { - fieldType => 'whatNext', - -options=>{ - view=>$i18n->get(823), - viewParent=>$i18n->get(847) - }, - -value=>"view", - }; - } else { + $extraFields{whatNext} = { + fieldType => 'whatNext', + value => "view", + options => { + view => $i18n->get(823), + viewParent => $i18n->get(847) + }, + }; + } + else { my @assetsToHide = split("\n",$self->getValue("assetsToHide")); my $children = $self->getLineage(["children"],{"returnObjects"=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout"]}); my %childIds; @@ -179,21 +180,21 @@ sub getEditForm { $childIds{$child->getId} = $child->getTitle; } $extraFields{assetsToHide} = { - fieldType => 'checkList', - tab => 'display', - -name=>"assetsToHide", - -value=>\@assetsToHide, - -options=>\%childIds, - -label=>$i18n->get('assets to hide'), - -hoverHelp=>$i18n->get('assets to hide description'), - -vertical=>1, - -uiLevel=>9, + fieldType => 'checkList', + tab => 'display', + name => "assetsToHide", + value => \@assetsToHide, + options => \%childIds, + label => $i18n->get('assets to hide'), + hoverHelp => $i18n->get('assets to hide description'), + vertical => 1, + uiLevel => 9, }; } my $overrides = $self->session->config->get("assets/".$self->get("className")); foreach my $fieldName (keys %extraFields) { - $self->setupFormField($tabform, $fieldName, \%extraFields, $overrides); + $self->setupFormField($tabform, $fieldName, \%extraFields, $overrides); } return $tabform;