r31705@martha (orig r1240): edenc | 2009-09-28 20:19:59 -0400

 made hidden array field use the value event instead of value_string
 r31706@martha (orig r1241):  purge | 2009-10-02 04:51:59 -0400
 allow redirect_to a url parameter
 r31707@martha (orig r1242):  groditi | 2009-10-02 16:09:49 -0400
 undo change allowing domain in redirect_to
 r31708@martha (orig r1243):  groditi | 2009-10-02 16:10:38 -0400
 cleanup of hard to read layout_args code

2 files changed, 15 insertions, 3 deletions

diff --git a/lib/Reaction/UI/ViewPort/Role/Actions.pm b/lib/Reaction/UI/ViewPort/Role/Actions.pm
index 89b5ae3..f2d40fb 100644
--- a/lib/Reaction/UI/ViewPort/Role/Actions.pm
+++ b/lib/Reaction/UI/ViewPort/Role/Actions.pm
@@ -62,14 +62,22 @@ 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 $layout_args;
+    if( exists $proto->{layout_args} ){
+      if( ref($proto->{layout_args}) eq 'CODE' ){
+        $layout_args = $proto->{layout_args}->($target, $ctx);
+      } else {
+        $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,
+      ( ref($layout_args) eq ' HASH' ? layout_args => $layout_args : () ),
     );
     push(@act, $action);
   }
diff --git a/lib/Reaction/UI/Widget/Field/Mutable/HiddenArray.pm b/lib/Reaction/UI/Widget/Field/Mutable/HiddenArray.pm
index e4e1c10..a65f3cb 100644
--- a/lib/Reaction/UI/Widget/Field/Mutable/HiddenArray.pm
+++ b/lib/Reaction/UI/Widget/Field/Mutable/HiddenArray.pm
@@ -11,6 +11,10 @@ implements fragment hidden_list {
 };
 
 implements fragment hidden_field {
+  # this needs to go here in order to override the field_name from
+  # Widget::Field::Mutable::Simple which defaults to value_string and does not
+  # make sense for HiddenArray
+  arg field_name => event_id 'value';
   arg field_value => $_;
 };