[Jifty-commit] r935 - in jifty/trunk: lib/Jifty/Web/Form

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Wed Apr 26 18:50:48 2006
New Revision: 935

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Web/Form/Clickable.pm

Log:
 r12640 at zoq-fot-pik:  chmrr | 2006-04-26 18:50:33 -0400
  * Fix buttons that should redirect to URLs


Modified: jifty/trunk/lib/Jifty/Web/Form/Clickable.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Clickable.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Clickable.pm	Wed Apr 26 18:50:48 2006
@@ -339,10 +339,6 @@
 
     my %parameters = ( %{ $self->{fallback} || {} }, $self->parameters );
 
-    # Actions to be submitted
-    $parameters{"J:ACTIONS"} = join( ';', @{ $self->submit } )
-        if $self->submit;
-
     my ($root) = $ENV{'REQUEST_URI'} =~ /([^\?]*)/;
 
     # Add a redirect, if this isn't to the right page
@@ -352,6 +348,11 @@
             arguments => { url => $self->url } );
         $parameters{ $redirect->register_name } = ref $redirect;
         $parameters{ $redirect->form_field_name('url') } = $self->url;
+        $parameters{"J:ACTIONS"} = join( ';', @{ $self->submit }, $redirect->moniker )
+          if $self->submit;
+    } else {
+        $parameters{"J:ACTIONS"} = join( ';', @{ $self->submit } )
+          if $self->submit;
     }
 
     return %parameters;