X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FReaction%2FUI%2FViewPort%2FCollection%2FGrid.pm;h=1cf3fd9a82b426c5939fac59b2395683bb51dfe0;hb=565a1fc7fe67c721f2766bdc3f55c5fcb33fc760;hp=be24cefdd6912fb061fa36558fcef3f531d1de36;hpb=642eb116a980729b37cb409094a94f9f6f39458c;p=catagits%2FReaction.git

diff --git a/lib/Reaction/UI/ViewPort/Collection/Grid.pm b/lib/Reaction/UI/ViewPort/Collection/Grid.pm
index be24cef..1cf3fd9 100644
--- a/lib/Reaction/UI/ViewPort/Collection/Grid.pm
+++ b/lib/Reaction/UI/ViewPort/Collection/Grid.pm
@@ -6,29 +6,31 @@ use aliased 'Reaction::InterfaceModel::Collection' => 'IM_Collection';
 use aliased 'Reaction::UI::ViewPort::Collection::Grid::Member::WithActions';
 
 use namespace::clean -except => [ qw(meta) ];
+use MooseX::Types::Moose qw/ArrayRef HashRef Int/;
 extends 'Reaction::UI::ViewPort::Collection';
 
-has field_order => ( is => 'ro', isa => 'ArrayRef', lazy_build => 1);
-has excluded_fields => ( is => 'ro', isa => 'ArrayRef', lazy_build => 1);
-has computed_field_order => (is => 'ro', isa => 'ArrayRef', lazy_build => 1);
+has field_order => ( is => 'ro', isa => ArrayRef, lazy_build => 1);
+has excluded_fields => ( is => 'ro', isa => ArrayRef, lazy_build => 1);
+has included_fields => ( is => 'ro', isa => ArrayRef, lazy_build => 1);
+has computed_field_order => (is => 'ro', isa => ArrayRef, lazy_build => 1);
 
 has _raw_field_labels => (
   is => 'rw',
-  isa => 'HashRef',
+  isa => HashRef,
   init_arg => 'field_labels',
   default => sub { {} },
 );
 
 has field_labels => (
   is => 'ro',
-  isa => 'HashRef',
+  isa => HashRef,
   lazy_build => 1,
   init_arg => undef,
 );
 
 has member_action_count => (
   is => 'rw',
-  isa => 'Int',
+  isa => Int,
   required => 1,
   lazy => 1,
   default => sub {
@@ -58,13 +60,17 @@ sub _build_field_order { []; }
 
 sub _build_excluded_fields { []; }
 
+sub _build_included_fields { [] }
+
 #this is a total clusterfuck and it sucks we should just eliminate it and have
 # the grid members not render ArrayRef or Collection fields
 sub _build_computed_field_order {
   my ($self) = @_;
   my %excluded = map { $_ => undef } @{ $self->excluded_fields };
+  my %included = map { $_ => undef } @{ $self->included_fields };
   #treat _$field_name as private and exclude fields with no reader
-  my @names = grep { $_ !~ /^_/ && !exists($excluded{$_})} map { $_->name }
+  my @names = grep { $_ !~ /^_/ &&  (!%included || exists( $included{$_}) )
+    && !exists($excluded{$_})} map { $_->name }
     grep {
       !($_->has_type_constraint &&
         ($_->type_constraint->is_a_type_of('ArrayRef') ||
@@ -118,6 +124,21 @@ homogenous collection of Reaction::InterfaceModel::Objects as a grid.
 
 =head2 excluded_fields
 
+List of field names to exclude.
+
+=head2 included_fields
+
+List of field names to include. If both C<included_fields> and
+C<excluded_fields> are specified the result is those fields which
+are in C<included_fields> and not in C<excluded_fields>.
+
+=head2 included_fields
+
+List of field names to include. If both C<included_fields> and
+C<excluded_fields> are specified the result is those fields which
+are in C<included_fields> and not in C<excluded_fields>.
+
+
 =head2 field_labels
 
 =head2 _raw_field_labels