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

WBGP indent processTemplate. i18n an error message

Browse source
This commit is contained in:
Colin Kuskie 2008-09-16 19:36:12 +00:00
parent bcc66cb6cb
commit b39624d31d
2 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/WebGUI/Asset.pm
View file

@ -2061,10 +2061,10 @@ Instead of passing in a templateId, you may pass in a template object.
=cut =cut
sub processTemplate { sub processTemplate {
my $self = shift; my $self = shift;
my $var = shift; my $var = shift;
my $templateId = shift; my $templateId = shift;
my $template = shift; my $template = shift;
# Sanity checks # Sanity checks
if (ref $var ne "HASH") { if (ref $var ne "HASH") {
@ -2072,19 +2072,21 @@ sub processTemplate {
return "Error: Can't process template for asset ".$self->getId." of type ".$self->get("className"); return "Error: Can't process template for asset ".$self->getId." of type ".$self->get("className");
} }
$template = WebGUI::Asset->new($self->session, $templateId,"WebGUI::Asset::Template") unless (defined $template); $template = WebGUI::Asset->new($self->session, $templateId,"WebGUI::Asset::Template") unless (defined $template);
if (defined $template) { if (defined $template) {
$var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } }; $var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } };
$var->{'controls'} = $self->getToolbar if $self->session->var->isAdminOn; $var->{'controls'} = $self->getToolbar if $self->session->var->isAdminOn;
my %vars = ( my %vars = (
%{$self->{_properties}}, %{$self->{_properties}},
%{$var} %{$var}
); );
return $template->process(\%vars); return $template->process(\%vars);
} else { }
$self->session->errorHandler->error("Can't instantiate template $templateId for asset ".$self->getId); else {
return "Error: Can't instantiate template ".$templateId; $self->session->errorHandler->error("Can't instantiate template $templateId for asset ".$self->getId);
} my $i18n = WebGUI::International->new($self->session, 'Asset');
return $i18n->get('Error: Cannot instantiate template').' '.$templateId;
}
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------

6
lib/WebGUI/i18n/English/Asset.pm
View file

@ -1103,6 +1103,12 @@ Couldn't open %-s because %-s <br />
context => q{Label for the menu to show actions to perform on an asset}, context => q{Label for the menu to show actions to perform on an asset},
}, },
'Error: Cannot instantiate template' => {
message => q{Error: Cannot instantiate template},
lastUpdated => 1221593874,
context => q{Error message in Asset.pm},
},
}; };
1; 1;