Code formatting and bugfix documentation for #11379.
This commit is contained in:
Colin Kuskie
parent
017a9a7fc2
commit
7c8f65ebdd
3 changed files with 64 additions and 62 deletions
|
|
@ -6,6 +6,7 @@
|
||||||
- fixed #11373: Problem creating FilePump bundles
|
- fixed #11373: Problem creating FilePump bundles
|
||||||
- fixed #11374: USPS shipping drivers take 3 minutes to timeout
|
- fixed #11374: USPS shipping drivers take 3 minutes to timeout
|
||||||
- fixed #11044: Optionally include hidden pages in sitemap.xml
|
- 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
|
7.8.10
|
||||||
- fixed #11332: Pagination in webgui.org forum urls
|
- fixed #11332: Pagination in webgui.org forum urls
|
||||||
|
|
|
||||||
|
|
@ -152,54 +152,54 @@ Returns the TabForm object that will be used in generating the edit page for thi
|
||||||
=cut
|
=cut
|
||||||
|
|
||||||
sub getEditForm {
|
sub getEditForm {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my $tabform = $self->SUPER::getEditForm();
|
my $tabform = $self->SUPER::getEditForm();
|
||||||
|
|
||||||
# Add the fields defined locally and apply any overrides from the config file
|
# 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 = {
|
my $extraFields = {
|
||||||
thumbnailSize => {
|
thumbnailSize => {
|
||||||
fieldType=>"integer",
|
fieldType => "integer",
|
||||||
-name=>"thumbnailSize",
|
name => "thumbnailSize",
|
||||||
-label=>$i18n->get('thumbnail size'),
|
label => $i18n->get('thumbnail size'),
|
||||||
-hoverHelp=>$i18n->get('Thumbnail size description'),
|
hoverHelp => $i18n->get('Thumbnail size description'),
|
||||||
-value=>$self->getValue("thumbnailSize"),
|
value => $self->getValue("thumbnailSize"),
|
||||||
},
|
},
|
||||||
parameters => {
|
parameters => {
|
||||||
fieldType=>"textarea",
|
fieldType => "textarea",
|
||||||
-name=>"parameters",
|
name => "parameters",
|
||||||
-label=>$i18n->get('parameters'),
|
label => $i18n->get('parameters'),
|
||||||
-hoverHelp=>$i18n->get('Parameters description'),
|
hoverHelp => $i18n->get('Parameters description'),
|
||||||
-value=>$self->getValue("parameters")
|
value => $self->getValue("parameters"),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
if ($self->get("filename") ne "") {
|
if ($self->get("filename") ne "") {
|
||||||
my ($x, $y) = $self->getStorageLocation->getSizeInPixels($self->get("filename"));
|
my ($x, $y) = $self->getStorageLocation->getSizeInPixels($self->get("filename"));
|
||||||
|
|
||||||
$extraFields->{thumbnail} = {
|
$extraFields->{thumbnail} = {
|
||||||
fieldType=>"readOnly",
|
fieldType => "readOnly",
|
||||||
-label=>$i18n->get('thumbnail'),
|
label => $i18n->get('thumbnail'),
|
||||||
-hoverHelp=>$i18n->get('Thumbnail description'),
|
hoverHelp => $i18n->get('Thumbnail description'),
|
||||||
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getThumbnailUrl.'?noCache='.$self->session->datetime->time().'" alt="thumbnail" /></a>'
|
value => '<a href="'.$self->getFileUrl.'"><img src="'.$self->getThumbnailUrl.'?noCache='.$self->session->datetime->time().'" alt="thumbnail" /></a>'
|
||||||
};
|
};
|
||||||
$extraFields->{imageSize} = {
|
$extraFields->{imageSize} = {
|
||||||
fieldType=>"readOnly",
|
fieldType => "readOnly",
|
||||||
-label=>$i18n->get('image size'),
|
label => $i18n->get('image size'),
|
||||||
-value=>$x.' x '.$y,
|
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}) {
|
foreach my $fieldName (keys %{$extraFields}) {
|
||||||
$self->setupFormField($tabform, $fieldName, $extraFields, $overrides);
|
$self->setupFormField($tabform, $fieldName, $extraFields, $overrides);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $tabform;
|
return $tabform;
|
||||||
}
|
}
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -149,29 +149,30 @@ sub getEditForm {
|
||||||
|
|
||||||
tie my %assetOrder, "Tie::IxHash";
|
tie my %assetOrder, "Tie::IxHash";
|
||||||
%assetOrder = (
|
%assetOrder = (
|
||||||
"asc" =>$i18n->get("asset order asc"),
|
"asc" => $i18n->get("asset order asc"),
|
||||||
"desc" =>$i18n->get("asset order desc"),
|
"desc" => $i18n->get("asset order desc"),
|
||||||
);
|
);
|
||||||
$extraFields{assetOrder} = {
|
$extraFields{assetOrder} = {
|
||||||
tab => 'display',
|
tab => 'display',
|
||||||
fieldType => 'selectBox',
|
fieldType => 'selectBox',
|
||||||
-name => 'assetOrder',
|
name => 'assetOrder',
|
||||||
-label => $i18n->get('asset order label'),
|
label => $i18n->get('asset order label'),
|
||||||
-hoverHelp => $i18n->get('asset order hoverHelp'),
|
hoverHelp => $i18n->get('asset order hoverHelp'),
|
||||||
-value => $self->getValue('assetOrder'),
|
value => $self->getValue('assetOrder'),
|
||||||
-options => \%assetOrder,
|
options => \%assetOrder,
|
||||||
};
|
};
|
||||||
|
|
||||||
if ($self->get("assetId") eq "new") {
|
if ($self->get("assetId") eq "new") {
|
||||||
$extraFields{whatNext} = {
|
$extraFields{whatNext} = {
|
||||||
fieldType => 'whatNext',
|
fieldType => 'whatNext',
|
||||||
-options=>{
|
value => "view",
|
||||||
view=>$i18n->get(823),
|
options => {
|
||||||
viewParent=>$i18n->get(847)
|
view => $i18n->get(823),
|
||||||
},
|
viewParent => $i18n->get(847)
|
||||||
-value=>"view",
|
},
|
||||||
};
|
};
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
my @assetsToHide = split("\n",$self->getValue("assetsToHide"));
|
my @assetsToHide = split("\n",$self->getValue("assetsToHide"));
|
||||||
my $children = $self->getLineage(["children"],{"returnObjects"=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout"]});
|
my $children = $self->getLineage(["children"],{"returnObjects"=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout"]});
|
||||||
my %childIds;
|
my %childIds;
|
||||||
|
|
@ -179,21 +180,21 @@ sub getEditForm {
|
||||||
$childIds{$child->getId} = $child->getTitle;
|
$childIds{$child->getId} = $child->getTitle;
|
||||||
}
|
}
|
||||||
$extraFields{assetsToHide} = {
|
$extraFields{assetsToHide} = {
|
||||||
fieldType => 'checkList',
|
fieldType => 'checkList',
|
||||||
tab => 'display',
|
tab => 'display',
|
||||||
-name=>"assetsToHide",
|
name => "assetsToHide",
|
||||||
-value=>\@assetsToHide,
|
value => \@assetsToHide,
|
||||||
-options=>\%childIds,
|
options => \%childIds,
|
||||||
-label=>$i18n->get('assets to hide'),
|
label => $i18n->get('assets to hide'),
|
||||||
-hoverHelp=>$i18n->get('assets to hide description'),
|
hoverHelp => $i18n->get('assets to hide description'),
|
||||||
-vertical=>1,
|
vertical => 1,
|
||||||
-uiLevel=>9,
|
uiLevel => 9,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
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) {
|
foreach my $fieldName (keys %extraFields) {
|
||||||
$self->setupFormField($tabform, $fieldName, \%extraFields, $overrides);
|
$self->setupFormField($tabform, $fieldName, \%extraFields, $overrides);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $tabform;
|
return $tabform;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue