diff options
author | purge <purge@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7> | 2009-10-02 08:51:59 +0000 |
---|---|---|
committer | purge <purge@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7> | 2009-10-02 08:51:59 +0000 |
commit | 08c27c5b18df934a3f052d50a9e4ab361ddc4f3e (patch) | |
tree | 48dd7b10c3de9be7dbb63ab013677762219164f2 | |
parent | bbf88e0ddb212f945a9641b80746e20cbafe3378 (diff) | |
download | reaction-08c27c5b18df934a3f052d50a9e4ab361ddc4f3e.tar.gz reaction-08c27c5b18df934a3f052d50a9e4ab361ddc4f3e.zip |
allow redirect_to a url parameter
-rw-r--r-- | lib/Reaction/UI/Controller.pm | 3 | ||||
-rw-r--r-- | lib/Reaction/UI/ViewPort/Role/Actions.pm | 10 | ||||
-rw-r--r-- | share/skin/base/layout/field/mutable.tt | 3 | ||||
-rw-r--r-- | share/skin/base/layout/field/mutable/choose_one.tt | 3 |
4 files changed, 11 insertions, 8 deletions
diff --git a/lib/Reaction/UI/Controller.pm b/lib/Reaction/UI/Controller.pm index 2d1b843..8222215 100644 --- a/lib/Reaction/UI/Controller.pm +++ b/lib/Reaction/UI/Controller.pm @@ -55,7 +55,7 @@ sub pop_viewports_to { } sub redirect_to { - my ($self, $c, $to, $cap, $args, $attrs) = @_; + my ($self, $c, $to, $cap, $args, $attrs, $domain) = @_; #the confess calls could be changed later to $c->log ? my $action; @@ -76,6 +76,7 @@ sub redirect_to { $args ||= $c->req->args; $attrs ||= {}; my $uri = $c->uri_for($action, $cap, @$args, $attrs); + $uri->host($domain) if $domain; $c->res->redirect($uri); } diff --git a/lib/Reaction/UI/ViewPort/Role/Actions.pm b/lib/Reaction/UI/ViewPort/Role/Actions.pm index 89b5ae3..778115b 100644 --- a/lib/Reaction/UI/ViewPort/Role/Actions.pm +++ b/lib/Reaction/UI/ViewPort/Role/Actions.pm @@ -62,14 +62,18 @@ sub _build_actions { my $uri = $proto->{uri} or confess('uri is required in prototype action'); my $label = exists $proto->{label} ? $proto->{label} : $proto_name; my $layout = exists $proto->{layout} ? $proto->{layout} : 'uri'; - my $layout_args = exists $proto->{layout_args} ? $proto->{layout_args} : {}; my $action = Reaction::UI::ViewPort::URI->new( location => join ('-', $loc, 'action', $i++), uri => ( ref($uri) eq 'CODE' ? $uri->($target, $ctx) : $uri ), display => ( ref($label) eq 'CODE' ? $label->($target, $ctx) : $label ), - layout => ( ref($layout) eq 'CODE' ? $layout->($target, $ctx) : $layout ), - layout_args => ( ref($layout_args) eq 'CODE' ? $layout_args->($target, $ctx) : $layout_args ), + layout => $layout, + exists $proto->{layout_args} ? + ( ref($proto->{layout_args}) eq 'CODE' ? + $proto->{layout_args}->($target, $ctx) + : + $proto->{layout_args} ) + : () ); push(@act, $action); } diff --git a/share/skin/base/layout/field/mutable.tt b/share/skin/base/layout/field/mutable.tt index 333a27a..c4ef2e1 100644 --- a/share/skin/base/layout/field/mutable.tt +++ b/share/skin/base/layout/field/mutable.tt @@ -18,8 +18,7 @@ class="required_field" =for layout field -<input type="[% field_type %]" name="[% field_name %]" id="[% field_id %]" - [% field_body %] /> +<input type="[% field_type %]" name="[% field_name %]" id="[% field_id %]" [% field_body %] /> =for layout field_body diff --git a/share/skin/base/layout/field/mutable/choose_one.tt b/share/skin/base/layout/field/mutable/choose_one.tt index 0db3ffd..c366a86 100644 --- a/share/skin/base/layout/field/mutable/choose_one.tt +++ b/share/skin/base/layout/field/mutable/choose_one.tt @@ -15,8 +15,7 @@ =for layout option - <option value="[% option_value %]" [% option_is_selected %] - > [% option_name %]</option> + <option value="[% option_value %]" [% option_is_selected %]>[% option_name %]</option> =for layout option_is_selected_yes |