Make Asset::getContainer no longer change the session asset.
This commit is contained in:
parent
68859ff045
commit
0d1c1ea96a
9 changed files with 16 additions and 12 deletions
|
|
@ -329,7 +329,8 @@ sub www_deleteEventConfirm {
|
|||
} else {
|
||||
$self->trash;
|
||||
}
|
||||
return $self->getParent->getContainer->www_view;;
|
||||
|
||||
return $self->session->asset($self->getParent->getContainer)->www_view;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ sub www_view {
|
|||
my $self = shift;
|
||||
return $self->session->privilege->noAccess() unless $self->canView;
|
||||
# if ($self->session->var->get("adminOn")) {
|
||||
# return $self->getContainer->www_view;
|
||||
# return $self->session->asset($self->getContainer)->www_view;
|
||||
# }
|
||||
|
||||
# Kludge for now to make this work with the exporter.
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ sub www_view {
|
|||
my $self = shift;
|
||||
return $self->session->privilege->noAccess() unless $self->canView;
|
||||
if ($self->session->var->isAdminOn) {
|
||||
return $self->getContainer->www_view;
|
||||
return $self->session->asset($self->getContainer)->www_view;
|
||||
}
|
||||
$self->session->http->setRedirect($self->getFileUrl($self->getValue("showPage")));
|
||||
return "1";
|
||||
|
|
|
|||
|
|
@ -623,7 +623,7 @@ sub www_styleWizard {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_view {
|
||||
my $self = shift;
|
||||
return $self->getContainer->www_view;
|
||||
return $self->session->asset($self->getContainer)->www_view;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -423,7 +423,8 @@ sub www_vote {
|
|||
}
|
||||
$self->getContainer->purgeCache;
|
||||
}
|
||||
return $self->getContainer->www_view;
|
||||
|
||||
return $self->session->asset($self->getContainer)->www_view;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue