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

fixed a macro problem

Browse source
This commit is contained in:
JT Smith 2006-01-30 18:22:54 +00:00
parent 82156de83c
commit 80fc76691f
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI.pm
View file

@ -117,6 +117,9 @@ sub page {
} }
$output = "An error was encountered while processing your request." if $output eq ''; $output = "An error was encountered while processing your request." if $output eq '';
} }
if ($session->errorHandler->canShowDebug()) {
$output .= $session->errorHandler->showDebug();
}
return $output; return $output;
} }

1
lib/WebGUI/Macro/JavaScript.pm
View file

@ -35,7 +35,6 @@ URL to the javascript to include in the page's header tags.
sub process { sub process {
my $session = shift; my $session = shift;
$session->style->setScript(shift,{type=>'text/javascript'}); $session->style->setScript(shift,{type=>'text/javascript'});
return "";
} }
1; 1;

9
lib/WebGUI/Session/Style.pm
View file

@ -212,13 +212,12 @@ if ($self->session->user->isInGroup(2)) {
} else { } else {
$output = "WebGUI was unable to instantiate your style template.".$var{'body.content'}; $output = "WebGUI was unable to instantiate your style template.".$var{'body.content'};
} }
WebGUI::Macro::process(\$output); WebGUI::Macro::process($self->session,\$output);
my $macroHeadTags = $self->generateAdditionalHeadTags(); my $macroHeadTags = $self->generateAdditionalHeadTags();
WebGUI::Macro::process(\$macroHeadTags);
$output =~ s/\<\!--morehead--\>/$macroHeadTags/; $output =~ s/\<\!--morehead--\>/$macroHeadTags/;
if ($self->session->errorHandler->canShowDebug()) { # if ($self->session->errorHandler->canShowDebug()) {
$output .= $self->session->errorHandler->showDebug(); # $output .= $self->session->errorHandler->showDebug();
} # }
return $output; return $output;
} }