[Jifty-commit] r5973 - in jifty/trunk: plugins/Multipage/lib/Jifty/Plugin/Multipage

[Jifty commits]

Author: alexmv
Date: Fri Oct 31 16:41:13 2008
New Revision: 5973

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/META.yml
   jifty/trunk/plugins/Multipage/lib/Jifty/Plugin/Multipage/Action.pm

Log:
 r38811 at kohr-ah:  chmrr | 2008-10-31 16:41:05 -0400
  * Turn off values_from_request for current request, so back button doesn't lose state


Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml	(original)
+++ jifty/trunk/META.yml	Fri Oct 31 16:41:13 2008
@@ -22,7 +22,6 @@
     - DB
 recommends: 
   Apache2::Const: 0
-  Authen::CAS::Client: 0
   Cache::FileCache: 0
   Chart::Base: 0
   Class::Accessor::Named: 0
@@ -34,27 +33,23 @@
   Devel::Gladiator: 0
   Devel::REPL: 0
   Devel::Size: 0
+  Email::Abstract: 0
   GD: 0
   GD::Graph: 0
-  HTML::Scrubber: 0
   Image::Info: 0
   LWPx::ParanoidAgent: 0
-  MIME::Base64::URLSafe: 0
   Module::CoreList: 0
   Module::Install::Admin: 0.50
   Module::Refresh: 0.09
-  Net::Akismet: 0
-  Net::LDAP: 0
   Net::OpenID::Consumer: 0
   Net::Server::Fork: 0
   Net::Server::PreFork: 0
   PAR::Dist::FromCPAN: 0
   Pod::Simple: 0
   Proc::ProcessTable: 0
-  Regexp::Common: 0
-  Regexp::Common::Email::Address: 0
   Template::Declare: 0.28
   Test::Base: 0.44
+  Test::Email: 0
   Test::HTML::Lint: 0
   Test::HTTP::Server::Simple: 0.02
   Test::MockModule: 0.05
@@ -73,7 +68,7 @@
   Class::Container: 0
   Class::Data::Inheritable: 0
   Class::Inspector: 1.2
-  Class::Trigger: 0.12
+  Class::Trigger: 0.13
   Clone: 0.27
   Compress::Zlib: 0
   Crypt::CBC: 0
@@ -106,7 +101,7 @@
   HTML::Mason::Plugin: 0
   HTTP::Cookies: 0
   HTTP::Date: 0
-  HTTP::Server::Simple: 0.28
+  HTTP::Server::Simple: 0.35
   HTTP::Server::Simple::Recorder: 0
   Hash::Merge: 0
   Hook::LexWrap: 0
@@ -115,6 +110,7 @@
   JSON::Syck: 0.29
   Jifty::DBI: 0.49
   LWP::UserAgent: 0
+  List::MoreUtils: 0
   Locale::Maketext::Extract: 0.20
   Locale::Maketext::Lexicon: 0.60
   Log::Log4perl: 1.04
@@ -125,9 +121,9 @@
   Module::Refresh: 0
   Module::ScanDeps: 0
   Object::Declare: 0.13
-  PadWalker: 0
   Params::Validate: 0
   SQL::ReservedWords: 0
+  SUPER: 0
   Scalar::Defer: 0.12
   Shell::Command: 0
   String::Koremutake: 0
@@ -150,5 +146,5 @@
   YAML::Syck: 0.71
   perl: 5.8.3
   version: 0
-tests: t/*.t t/*/*.t t/*/*/*.t t/*/*/*/*.t plugins/TabView/t/*.t
-version: 0.80408
+tests: t/*.t t/*/*.t t/*/*/*.t t/*/*/*/*.t plugins/TabView/t/*.t plugins/TabView/t/*/*/*.t
+version: 0.80913

Modified: jifty/trunk/plugins/Multipage/lib/Jifty/Plugin/Multipage/Action.pm
==============================================================================
--- jifty/trunk/plugins/Multipage/lib/Jifty/Plugin/Multipage/Action.pm	(original)
+++ jifty/trunk/plugins/Multipage/lib/Jifty/Plugin/Multipage/Action.pm	Fri Oct 31 16:41:13 2008
@@ -50,6 +50,12 @@
     push @actions, Jifty->web->request->action( $self->moniker )
       if Jifty->web->request->action( $self->moniker );
 
+    # Keep track of the current request, as that trumps default
+    # values.  This makes the back button "remember" what you entered
+    # when you were previously on the page.
+    my %this;
+    %this = %{$actions[0]->arguments} if @actions;
+
     # Also, all earlier versions of this action in the continuation tree
     my $cont = Jifty->web->request->continuation;
     while ( $cont and $cont->request->action( $self->moniker ) ) {
@@ -71,6 +77,7 @@
     # Track how an argument was set, again new_action args taking precedent
     $self->values_from_request({});
     $self->values_from_request->{$_} = 1 for keys %earlier;
+    $self->values_from_request->{$_} = 0 for keys %this;
     $self->values_from_request->{$_} = 0 for keys %{ $args{'arguments' } };
 
     return $self;