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

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Thu Feb  9 17:37:06 2006
New Revision: 565

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

Log:
 r9024 at zoq-fot-pik:  chmrr | 2006-02-09 17:36:27 -0500
  * Need to make sure we set the action class of the result after we
 re-init it after validation and saving continuations


Modified: jifty/trunk/lib/Jifty/Continuation.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Continuation.pm	(original)
+++ jifty/trunk/lib/Jifty/Continuation.pm	Thu Feb  9 17:37:06 2006
@@ -186,8 +186,10 @@
         # results from the continuation's response into the existing
         # response only if it wouldn't clobber something.
         my %results = $self->response->results;
-        Jifty->web->response->result($_,Clone::clone($results{$_}))
-          for grep {not Jifty->web->response->result($_)} keys %results;
+        for (keys %results) {
+            next if Jifty->web->response->result($_);
+            Jifty->web->response->result($_,Clone::clone($results{$_}));
+        }
 
         # Run any code in the continuation
         $self->code->(Jifty->web->request)

Modified: jifty/trunk/lib/Jifty/Request.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Request.pm	(original)
+++ jifty/trunk/lib/Jifty/Request.pm	Thu Feb  9 17:37:06 2006
@@ -411,6 +411,7 @@
     my $self = shift;
     my $cont = $self->arguments->{'J:CALL'};
     return unless $cont and Jifty->web->session->get_continuation($cont);
+    $self->log->debug("Calling continuation $cont");
     $self->continuation(Jifty->web->session->get_continuation($cont));
     $self->continuation->call;
 }

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Thu Feb  9 17:37:06 2006
@@ -248,6 +248,7 @@
 
             # Try validating again
             $action->result(Jifty::Result->new);
+            $action->result->action_class(ref $action);
             $self->response->result( $action->moniker => $action->result );
             eval {
                 $self->log->debug("Validating action ".ref($action). " ".$action->moniker);

Modified: jifty/trunk/lib/Jifty/Web/Form.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form.pm	Thu Feb  9 17:37:06 2006
@@ -103,7 +103,9 @@
 
 =head2 register_action ACTION
 
-Adds C<ACTION> as an action for this form. Called so that actions' form fields can register the action against the form they're being used in.
+Adds C<ACTION> as an action for this form. Called so that actions'
+form fields can register the action against the form they're being
+used in.
 
 =cut
 
@@ -235,8 +237,9 @@
 }
 
 
-# At the point this is called, it should only include actions we're registering that have no form fields
-# and haven't been explicitly registered.
+# At the point this is called, it should only include actions we're
+# registering that have no form fields and haven't been explicitly
+# registered.
 sub _print_registered_actions {
     my $self = shift;
     for my $a ( keys %{ $self->actions } ) {