[Jifty-commit] r5072 - in jifty/trunk: lib/Jifty/View/Declare lib/Jifty/View/Mason lib/Jifty/Web
Jifty commits
jifty-commit at lists.jifty.org
Thu Feb 7 16:27:05 EST 2008
Author: alexmv
Date: Thu Feb 7 16:27:04 2008
New Revision: 5072
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/View/Declare/Handler.pm
jifty/trunk/lib/Jifty/View/Mason/Handler.pm
jifty/trunk/lib/Jifty/Web/PageRegion.pm
Log:
r27701 at zoq-fot-pik: chmrr | 2008-02-07 16:26:41 -0500
* Template arguments override normal args, when talking to templates
* Template arguments don't propagate down into pageregion calls
Modified: jifty/trunk/lib/Jifty/View/Declare/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Declare/Handler.pm (original)
+++ jifty/trunk/lib/Jifty/View/Declare/Handler.pm Thu Feb 7 16:27:04 2008
@@ -75,7 +75,7 @@
goto &Template::Declare::Tags::outs_raw;
};
- my $content = Template::Declare::Tags::show_page( $template, { %{Jifty->web->request->template_arguments}, %{Jifty->web->request->arguments} } );
+ my $content = Template::Declare::Tags::show_page( $template, { %{Jifty->web->request->arguments}, %{Jifty->web->request->template_arguments} } );
return unless defined $content;
my $r = Jifty->handler->apache;
Modified: jifty/trunk/lib/Jifty/View/Mason/Handler.pm
==============================================================================
--- jifty/trunk/lib/Jifty/View/Mason/Handler.pm (original)
+++ jifty/trunk/lib/Jifty/View/Mason/Handler.pm Thu Feb 7 16:27:04 2008
@@ -231,7 +231,7 @@
=cut
sub request_args {
- return %{Jifty->web->request->template_arguments}, %{Jifty->web->request->arguments};
+ return %{Jifty->web->request->arguments}, %{Jifty->web->request->template_arguments};
}
###########################################################
Modified: jifty/trunk/lib/Jifty/Web/PageRegion.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/PageRegion.pm (original)
+++ jifty/trunk/lib/Jifty/Web/PageRegion.pm Thu Feb 7 16:27:04 2008
@@ -316,6 +316,7 @@
$subrequest->argument( region => $self );
# XXX: use ->arguments?
$subrequest->argument( $_ => $arguments->{$_}) for keys %$arguments;
+ $subrequest->template_arguments({});
$subrequest->path( $self->path );
$subrequest->top_request( Jifty->web->request->top_request );
More information about the Jifty-commit
mailing list