X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FReaction%2FUI%2FViewPort%2FCollection%2FGrid.pm;h=abdecc4e0c0cd3af983066b8d3cdf053119966da;hb=3c18c3227e21136f3e7d6feb51ef7745e0a6d412;hp=42d69f775aca5e5d525a37e3c1318944579f5334;hpb=8139388160b0a38002b22ff95c3fee3d8380f156;p=catagits%2FReaction.git

diff --git a/lib/Reaction/UI/ViewPort/Collection/Grid.pm b/lib/Reaction/UI/ViewPort/Collection/Grid.pm
index 42d69f7..abdecc4 100644
--- a/lib/Reaction/UI/ViewPort/Collection/Grid.pm
+++ b/lib/Reaction/UI/ViewPort/Collection/Grid.pm
@@ -3,36 +3,74 @@ package Reaction::UI::ViewPort::Collection::Grid;
 use Reaction::Class;
 
 use aliased 'Reaction::InterfaceModel::Collection' => 'IM_Collection';
-use aliased 'Reaction::UI::ViewPort::Collection::Grid::Member';
+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 field_labels    => ( is => 'ro', isa => 'HashRef',  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,
+  init_arg => 'field_labels',
+  default => sub { {} },
+);
+
+has field_labels => (
+  is => 'ro',
+  isa => HashRef,
+  lazy_build => 1,
+  init_arg => undef,
+);
+
+has member_action_count => (
+  is => 'rw',
+  isa => Int,
+  required => 1,
+  lazy => 1,
+  default => sub {
+    my $self = shift;
+    for (@{ $self->members }) {
+      my $protos = $_->action_prototypes;
+      return scalar(keys(%$protos));
+    }
+    return 1;
+  },
+);
 
 ####################################
-sub _build_member_class { Member };
+sub _build_member_class { WithActions };
+
 sub _build_field_labels {
   my $self = shift;
-  my %labels;
-  for my $field ( @{$self->computed_field_order}){
+  my %labels = %{$self->_raw_field_labels};
+  for my $field ( @{$self->computed_field_order}) {
+    next if defined $labels{$field};
     $labels{$field} = join(' ', map{ ucfirst } split('_', $field));
   }
   return \%labels;
-};
-sub _build_field_order { []; };
-sub _build_excluded_fields { []; };
+}
+
+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') ||
@@ -44,11 +82,15 @@ sub _build_computed_field_order {
         $self->current_collection->member_type->parameter_attributes;
 
   return $self->sort_by_spec($self->field_order, \@names);
-};
+}
 
-before _build_members => sub {
-  my ($self) = @_;
+around _build_members => sub {
+  my $orig = shift;
+  my $self = shift;
   $self->member_args->{computed_field_order} ||= $self->computed_field_order;
+  my $members = $self->$orig(@_);
+
+  return $members;
 };
 
 __PACKAGE__->meta->make_immutable;
@@ -73,11 +115,28 @@ 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
+
 =head2 computed_field_order
 
-=head1
+=head2 member_action_count
 
 =head1 INTERNAL METHODS