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

Fixed getRoot, getDefault, and getNotFound to pass them a session

Browse source
This commit is contained in:
Roy Johnson 2006-01-17 16:13:16 +00:00
parent 6eb252d907
commit cd45f88e9f
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/AdminConsole.pm
View file

@ -416,7 +416,7 @@ sub render {
my $importNodeLineage = $importNode->get("lineage"); my $importNodeLineage = $importNode->get("lineage");
my $assetLineage = $self->session->asset->get("lineage"); my $assetLineage = $self->session->asset->get("lineage");
if ($assetLineage =~ /^$importNodeLineage/ || $assetLineage eq "000001") { if ($assetLineage =~ /^$importNodeLineage/ || $assetLineage eq "000001") {
$var{"backtosite.url"} = $self->session->asset->getDefault->getUrl; $var{"backtosite.url"} = $self->getDefault($self->session)->getUrl;
} else { } else {
$var{"backtosite.url"} = $self->session->asset->getContainer->getUrl; $var{"backtosite.url"} = $self->session->asset->getContainer->getUrl;
} }

2
lib/WebGUI/Asset/Wobject.pm
View file

@ -584,7 +584,7 @@ sub www_view {
return ""; return "";
} else { # tell em it doesn't exist anymore } else { # tell em it doesn't exist anymore
$self->session->http->setStatus("410"); $self->session->http->setStatus("410");
return WebGUI::Asset->getNotFound->www_view; return WebGUI::Asset->getNotFound($self->session)->www_view;
} }
} }
if ($self->get("encryptPage") && $self->session->env->get("HTTPS") ne "on") { if ($self->get("encryptPage") && $self->session->env->get("HTTPS") ne "on") {

2
lib/WebGUI/Asset/Wobject/EventsCalendar.pm
View file

@ -213,7 +213,7 @@ sub view {
$children = $self->getLineage(["descendants"],{returnObjects=>1, $children = $self->getLineage(["descendants"],{returnObjects=>1,
includeOnlyClasses=>["WebGUI::Asset::Event"]}); includeOnlyClasses=>["WebGUI::Asset::Event"]});
} elsif ($scope == 1) { #calendar is global } elsif ($scope == 1) { #calendar is global
$children = WebGUI::Asset::getRoot()->getLineage(["descendants"],{returnObjects=>1, $children = WebGUI::Asset::getRoot($self->session)->getLineage(["descendants"],{returnObjects=>1,
includeOnlyClasses=>["WebGUI::Asset::Event"]}); includeOnlyClasses=>["WebGUI::Asset::Event"]});
} }

2
lib/WebGUI/Form/Asset.pm
View file

@ -95,7 +95,7 @@ Renders an asset selector.
sub toHtml { sub toHtml {
my $self = shift; my $self = shift;
my $asset = WebGUI::Asset->newByDynamicClass($self->get("value")) || WebGUI::Asset->getRoot; my $asset = WebGUI::Asset->newByDynamicClass($self->get("value")) || WebGUI::Asset->getRoot($self->session);
return WebGUI::Form::Hidden->new( return WebGUI::Form::Hidden->new(
name=>$self->get("name"), name=>$self->get("name"),
extras=>$self->get("extras"), extras=>$self->get("extras"),