[Jifty-commit] jifty branch, master, updated. f73987bdc6a4e44cdbe11120437abd74182d2b73

Jifty commits jifty-commit at lists.jifty.org
Mon Mar 8 10:07:04 EST 2010


The branch, master has been updated
       via  f73987bdc6a4e44cdbe11120437abd74182d2b73 (commit)
      from  87dd4c7385010fac05d54c3df6110cd934062044 (commit)

Summary of changes:
 lib/Jifty/Continuation.pm       |    2 +-
 lib/Jifty/Web/Form/Clickable.pm |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit f73987bdc6a4e44cdbe11120437abd74182d2b73
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Mar 8 23:03:45 2010 +0800

    use request_uri to render the url and to redirect

diff --git a/lib/Jifty/Continuation.pm b/lib/Jifty/Continuation.pm
index e5c65e0..d84ced1 100644
--- a/lib/Jifty/Continuation.pm
+++ b/lib/Jifty/Continuation.pm
@@ -223,7 +223,7 @@ sub call {
         if defined $next->parent;
 
     # Redirect to right page if we're not there already
-    Jifty->web->_redirect($next->request->path . "?J:RETURN=" . $next->id);
+    Jifty->web->_redirect(URI->new($next->request->request_uri)->path . "?J:RETURN=" . $next->id);
     return 1;
 }
 
diff --git a/lib/Jifty/Web/Form/Clickable.pm b/lib/Jifty/Web/Form/Clickable.pm
index 9235958..29d2535 100644
--- a/lib/Jifty/Web/Form/Clickable.pm
+++ b/lib/Jifty/Web/Form/Clickable.pm
@@ -476,7 +476,7 @@ sub complete_url {
 
     my %parameters = $self->get_parameters;
 
-    my $url = $self->returns ? Jifty->web->request->top_request->path : $self->url;
+    my $url = $self->returns ? URI->new(Jifty->web->request->request_uri)->path : $self->url;
     if (%parameters) {
         $url .= ( $url =~ /\?/ ) ? ";" : "?";
         $url .= Jifty->web->query_string(%parameters);

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list