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

oodles of fixes.

Browse source
This commit is contained in:
Matthew Wilson 2006-01-15 15:56:17 +00:00
parent 029dca1f2e
commit 65823b1f53
38 changed files with 87 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/WebGUI/Session/ErrorHandler.pm
View file

@ -174,6 +174,7 @@ sub error {
my $self = shift;
my $message = shift;
$self->getLogger->error($message);
print("\n\n".$message.":\n".$self->getStackTrace());
$self->getLogger->debug("Stack trace for ERROR ".$message."\n".$self->getStackTrace());
$self->session->stow->set("debug_error", $self->session->stow->get("debug_error").$message."\n");
}

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

@ -103,7 +103,7 @@ sub generateAdditionalHeadTags {
$tags .= ' />'."\n";
}
# append extraHeadTags
$tags .= $self->session->asset->getExtraHeadTags."\n" if ($self->session->asset);
# $tags .= $self->session->asset->getExtraHeadTags."\n" if ($self->session->asset);
delete $self->{_meta};
delete $self->{_raw};
delete $self->{_javascript};
@ -205,16 +205,16 @@ if ($self->session->user->isInGroup(2)) {
';
}
$var{'head.tags'} .= "\n<!-- macro head tags -->\n";
my $style = WebGUI::Asset::Template->new($templateId);
my $style = WebGUI::Asset::Template->new($self->session,$templateId);
my $output;
if (defined $style) {
$output = $style->process(\%var);
} else {
$output = "WebGUI was unable to instantiate your style template.".$var{'body.content'};
}
WebGUI::Macro::process(\$output);
WebGUI::Macro::process($self->session,\$output);
my $macroHeadTags = generateAdditionalHeadTags();
WebGUI::Macro::process(\$macroHeadTags);
WebGUI::Macro::process($self->session,\$macroHeadTags);
$output =~ s/\<\!-- macro head tags --\>/$macroHeadTags/;
if ($self->session->errorHandler->canShowDebug()) {
$output .= $self->session->errorHandler->showDebug();