r22767@hercule (orig r1158): mateu | 2009-07-28 14:16:29 +0100

 Document make_context_closure().
 r22768@hercule (orig r1159):  mateu | 2009-07-28 14:30:05 +0100
 Avoid circular refs with target_model for login actions
 r22771@hercule (orig r1162):  xinming | 2009-07-29 06:10:29 +0100
 Merge branch utf8_support branch (r1109:1112) into trunk.
 r22786@hercule (orig r1177):  wreis | 2009-07-30 22:39:28 +0100
  r4424@www43 (orig r1173):  wallacer | 2009-07-30 14:06:53 -0500
  branching for action_filter feature in Role::Actions
  r4426@www43 (orig r1175):  wallacer | 2009-07-30 16:13:22 -0500
  added action_filter
  r4427@www43 (orig r1176):  wallacer | 2009-07-30 16:39:15 -0500
  fixed default value
 
 r22788@hercule (orig r1179):  wreis | 2009-07-30 22:45:32 +0100
 patch from groditi
 r22795@hercule (orig r1186):  wreis | 2009-07-31 13:53:07 +0100
 tweaks for SearchableListViewContainer

2 files changed, 14 insertions, 8 deletions

diff --git a/lib/Reaction/UI/ViewPort/Role/Actions.pm b/lib/Reaction/UI/ViewPort/Role/Actions.pm
index 6f3cd6a..ebd2d3c 100644
--- a/lib/Reaction/UI/ViewPort/Role/Actions.pm
+++ b/lib/Reaction/UI/ViewPort/Role/Actions.pm
@@ -16,6 +16,10 @@ has action_order => (
   isa => 'ArrayRef'
 );
 
+has action_filter => (
+  isa => 'CodeRef', is => 'ro',
+);
+
 has action_prototypes => (
   is => 'ro',
   isa => 'HashRef',
@@ -35,7 +39,8 @@ sub _build_computed_action_order {
     ($self->has_action_order ? $self->action_order : []),
     [ keys %{ $self->action_prototypes } ]
   );
-  return $ordered ;
+  return $self->has_action_filter ?
+      $self->action_filter->($ordered, $self->model) : $ordered;
 }
 
 sub _build_actions {
diff --git a/lib/Reaction/UI/ViewPort/SearchableListViewContainer.pm b/lib/Reaction/UI/ViewPort/SearchableListViewContainer.pm
index b9f919d..a5696c9 100644
--- a/lib/Reaction/UI/ViewPort/SearchableListViewContainer.pm
+++ b/lib/Reaction/UI/ViewPort/SearchableListViewContainer.pm
@@ -5,6 +5,7 @@ use Reaction::Class;
 use aliased 'Reaction::InterfaceModel::Action::Search::UpdateSpec', 'UpdateSearchSpec';
 use aliased 'Reaction::UI::ViewPort::ListViewWithSearch';
 use aliased 'Reaction::UI::ViewPort::Action' => 'ActionVP';
+use aliased 'Reaction::UI::ViewPort';
 use aliased 'Reaction::UI::ViewPort::Collection::Role::Pager', 'PagerRole';
 
 use Method::Signatures::Simple;
@@ -14,18 +15,20 @@ use namespace::clean -except => 'meta';
 extends 'Reaction::UI::ViewPort';
 
 has 'listview' => (
-    isa => ListViewWithSearch, 
+    isa => ViewPort,
     is => 'ro', 
     required => 1, 
 );
 
-has 'search_form' => (isa => ActionVP, is => 'ro', required => 1);
+has 'search_form' => (isa => ViewPort, is => 'ro', required => 1);
 
 override BUILDARGS => sub {
   my $args = super;
   my $spec_event_id = $args->{location}.':search-spec';
   my $spec_class = $args->{spec_class}
     or confess "Argument spec_class is required";
+  my $listview_class = $args->{'listview_class'} || ListViewWithSearch;
+  my $search_form_class = $args->{'search_form_class'} || ActionVP; 
   my $action_class = $args->{action_class}
     or confess "Argument action_class is required";
 #  TODO: how do we autodiscover spec classes?
@@ -39,15 +42,13 @@ override BUILDARGS => sub {
     }
   };
   my $listview_location = $args->{location}.'-listview';
-  # should this maybe use the listview class in $args->{listview}?
-  my $listview = $args->{listview} = ListViewWithSearch->new(
+  my $listview = $args->{listview} = $listview_class->new(
     %$args,
-    layout => 'list_view',
+    layout => $args->{'listview_layout'} || 'list_view',
     search_spec => $spec,
     location => $listview_location,
   );
-  # same as with listview wrt. class name
-  $args->{search_form} = ActionVP->new(
+  $args->{search_form} = $search_form_class->new(
     model => $action_class->new(target_model => $spec),
     location => $args->{location}.'-search_form',
     apply_label => 'search',