always call proceed on new object

This commit is contained in:
Doug Bell 2010-11-09 13:40:21 -06:00
parent a64b769755
commit 16bfacadca

View file

@ -2235,7 +2235,7 @@ sub prepareWidgetView {
=head2 proceed ( [method] ) =head2 proceed ( [method] )
Proceed from a form submit based on the given method. By default, checks the "proceed" Redirect from a form submit based on the given method. By default, checks the "proceed"
form parameter. form parameter.
Proceed types: Proceed types:
@ -2255,15 +2255,15 @@ sub proceed {
my $proceed ||= $session->form->process('proceed'); my $proceed ||= $session->form->process('proceed');
if ($proceed eq "manageAssets") { if ($proceed eq "manageAssets") {
$session->asset($object->getParent); $session->asset($self->getParent);
return $session->asset->www_manageAssets; return $session->asset->www_manageAssets;
} }
elsif ($proceed eq "viewParent") { elsif ($proceed eq "viewParent") {
$session->asset($object->getParent); $session->asset($self->getParent);
return $session->asset->www_view; return $session->asset->www_view;
} }
elsif ($proceed eq "editParent") { elsif ($proceed eq "editParent") {
$session->asset($object->getParent); $session->asset($self->getParent);
return $session->asset->www_edit; return $session->asset->www_edit;
} }
elsif ($proceed eq "goBackToPage" && $session->form->process('returnUrl')) { elsif ($proceed eq "goBackToPage" && $session->form->process('returnUrl')) {
@ -2272,11 +2272,11 @@ sub proceed {
} }
elsif ($proceed ne "") { elsif ($proceed ne "") {
my $method = "www_".$session->form->process("proceed"); my $method = "www_".$session->form->process("proceed");
$session->asset($object); $session->asset($self);
return $session->asset->$method(); return $session->asset->$method();
} }
$session->asset($object->getContainer); $session->asset($self->getContainer);
return $session->asset->www_view; return $session->asset->www_view;
} }
@ -2836,7 +2836,7 @@ sub www_addSave {
} }
# Handle "proceed" form parameter # Handle "proceed" form parameter
return $self->proceed; return $object->proceed;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------