Code formatting and bugfix documentation for #11379.

This commit is contained in:
Colin Kuskie 2010-01-27 16:15:45 -08:00
parent 017a9a7fc2
commit 7c8f65ebdd
3 changed files with 64 additions and 62 deletions

View file

@ -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=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getThumbnailUrl.'?noCache='.$self->session->datetime->time().'" alt="thumbnail" /></a>'
fieldType => "readOnly",
label => $i18n->get('thumbnail'),
hoverHelp => $i18n->get('Thumbnail description'),
value => '<a href="'.$self->getFileUrl.'"><img src="'.$self->getThumbnailUrl.'?noCache='.$self->session->datetime->time().'" alt="thumbnail" /></a>'
};
$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;
}
#-------------------------------------------------------------------