merge of Snippet fix

This commit is contained in:
Colin Kuskie 2006-02-05 02:51:47 +00:00
parent 175622c23e
commit 67511cd89f
5 changed files with 49 additions and 3 deletions

View file

@ -139,7 +139,7 @@ Returns a toolbar with a set of icons that hyperlink to functions that delete, e
sub getToolbar {
my $self = shift;
return undef if ($self->getToolbarState);
return $self->SUPER::getToolbar();
return '<p>'.$self->SUPER::getToolbar().'</p>';
}
#-------------------------------------------------------------------
@ -164,7 +164,7 @@ sub view {
my $calledAsWebMethod = shift;
my $output = $self->get("snippet");
WebGUI::Macro::process($self->session,\$output);
$output = '<p>'.$self->getToolbar.'</p>'.$output if ($self->session->var->get("adminOn") && !$calledAsWebMethod);
$output = $self->getToolbar.$output if ($self->session->var->get("adminOn") && !$calledAsWebMethod);
return $output unless ($self->getValue("processAsTemplate"));
return WebGUI::Asset::Template->processRaw($self->session, $output);
}