[Jifty-commit] r1070 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: seanmil
Date: Mon May 15 19:54:05 2006
New Revision: 1070

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

Log:
 r81 at localhost:  sean | 2006-05-15 19:53:14 -0400
 * Proper fix (hopefully) for state variable handling in Jifty::Web


Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Mon May 15 19:54:05 2006
@@ -466,7 +466,8 @@
 
     if ($self->next_page
         and ( ( $self->next_page ne $self->request->path )
-            or $self->request->state_variables )
+            or $self->request->state_variables
+            or $self->{'state_variables'} )
         )
     {
         return (1);
@@ -493,12 +494,15 @@
 
     if (   $self->response->results
         or $self->request->state_variables
+        or $self->{'state_variables'}
         or @unrun )
     {
         my $request = Jifty::Request->new();
         $request->path($page);
         $request->add_state_variable( key => $_->key, value => $_->value )
           for $self->request->state_variables;
+        $request->add_state_variable( key => $_, value => $self->{'state_variables'}->{$_} )
+          for keys %{ $self->{'state_variables'} };
         for (@unrun) {
             $request->add_action(
                 moniker   => $_->moniker,
@@ -671,8 +675,8 @@
     if ( defined wantarray ) {
         return $clickable->generate->render;
     } else {
-        $clickable->state_variable( $_->key, $_->value )
-            for $self->request->state_variables;
+        $clickable->state_variable( $_ => $self->{'state_variables'}{$_} )
+            for keys %{ $self->{'state_variables'} };
 
         my $request = Jifty::Request->new(path => Jifty->web->request->path)
           ->from_webform(%{Jifty->web->request->arguments}, $clickable->get_parameters);
@@ -872,7 +876,8 @@
     my $name  = shift;
     my $value = shift;
 
-    $self->request->add_state_variable( key => $name, value => $value );
+    $self->{'state_variables'}->{$name} = $value;
+
 }
 
 =head3 state_variables
@@ -887,8 +892,8 @@
 sub state_variables {
     my $self = shift;
     my %vars;
-    $vars{ "J:V-" . $_->key } = $_->value
-        for $self->request->state_variables;
+    $vars{ "J:V-" . $_ } = $self->{'state_variables'}->{$_}
+        for keys %{ $self->{'state_variables'} };
 
     return %vars;
 }