From 5cab2c1639e97a3104173538224aceb80c7d61d4 Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Tue, 9 Nov 2010 13:42:50 -0600 Subject: [PATCH] always redirect, never just return content --- lib/WebGUI/Asset.pm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index cf99be202..6905ddb04 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -2259,25 +2259,24 @@ sub proceed { return $session->asset->www_manageAssets; } elsif ($proceed eq "viewParent") { - $session->asset($self->getParent); - return $session->asset->www_view; + $session->http->setRedirect( $self->getParent->getUrl ); + return "redirect"; } elsif ($proceed eq "editParent") { - $session->asset($self->getParent); - return $session->asset->www_edit; + $session->http->setRedirect( $self->getParent->getUrl('func=edit') ); + return "redirect"; } elsif ($proceed eq "goBackToPage" && $session->form->process('returnUrl')) { $session->http->setRedirect($session->form->process("returnUrl")); - return undef; + return "redirect"; } elsif ($proceed ne "") { - my $method = "www_".$session->form->process("proceed"); - $session->asset($self); - return $session->asset->$method(); + $session->http->setRedirect( $self->getUrl( 'func=' . $proceed ) ); + return "redirect"; } - $session->asset($self->getContainer); - return $session->asset->www_view; + $session->http->setRedirect( $self->getUrl ); + return "redirect"; } #-------------------------------------------------------------------