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

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Feb 24 17:19:45 EST 2006


Author: alexmv
Date: Fri Feb 24 17:19:43 2006
New Revision: 623

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

Log:
 r9309 at zoq-fot-pik:  chmrr | 2006-02-24 17:18:53 -0500
  * Set up response, session, and ookies before dispatcher
  * When tangenting, stick in all of this request's arguments


Modified: jifty/trunk/lib/Jifty/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Handler.pm	(original)
+++ jifty/trunk/lib/Jifty/Handler.pm	Fri Feb 24 17:19:43 2006
@@ -145,6 +145,10 @@
     local $HTML::Mason::Commands::JiftyWeb = Jifty::Web->new();
     Jifty->web->request(Jifty::Request->new()->fill($self->cgi));
 
+    Jifty->web->response( Jifty::Response->new );
+    Jifty->web->setup_session;
+    Jifty->web->session->set_cookie;
+
     Jifty->log->debug("Received request for ".Jifty->web->request->path);
 
     $self->mason(Jifty::MasonHandler->new(

Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm	(original)
+++ jifty/trunk/lib/Jifty/Web.pm	Fri Feb 24 17:19:43 2006
@@ -215,8 +215,6 @@
 sub handle_request {
     my $self = shift;
     die "No request to handle" unless Jifty->web->request;
-    Jifty->web->response( Jifty::Response->new ) unless $self->response;
-    Jifty->web->setup_session;
 
     my @valid_actions;
     for my $request_action ( $self->request->actions ) {
@@ -637,7 +635,7 @@
     my $self = shift;
     my $page = shift || $self->next_page;
 
-    if ( ($self->response and $self->response->results)
+    if (   $self->response->results
         or $self->request->state_variables )
     {
         my $request = Jifty::Request->new();
@@ -806,7 +804,7 @@
             for keys %{ $self->{'state_variables'} };
 
         my $request = Jifty::Request->new(path => Jifty->web->request->path)
-          ->from_webform($clickable->get_parameters);
+          ->from_webform(%{Jifty->web->request->arguments}, $clickable->get_parameters);
         local Jifty->web->{request} = $request;
         Jifty->web->handle_request();
     }


More information about the Jifty-commit mailing list