rewrite IM predicates

[catagits/Reaction.git] / lib / Reaction / UI / ViewPort / Field.pm

diff --git a/lib/Reaction/UI/ViewPort/Field.pm b/lib/Reaction/UI/ViewPort/Field.pm
index 1594c06..1ccc99c 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Field.pm
+++ b/lib/Reaction/UI/ViewPort/Field.pm
@@ -6,7 +6,7 @@ use aliased 'Reaction::Meta::InterfaceModel::Object::ParameterAttribute';
 
 class Field is 'Reaction::UI::ViewPort', which {
 
-  has value        => (is => 'rw', lazy_build => 1, clearer => 'clear_value');
+  has value        => (is => 'rw', lazy_build => 1);
   has name         => (is => 'rw', isa => 'Str', lazy_build => 1);
   has label        => (is => 'rw', isa => 'Str', lazy_build => 1);
   has value_string => (is => 'rw', isa => 'Str', lazy_build => 1);
@@ -14,15 +14,8 @@ class Field is 'Reaction::UI::ViewPort', which {
   has model     => (is => 'ro', isa => Object,             required => 1);
   has attribute => (is => 'ro', isa => ParameterAttribute, required => 1);
 
-  implements adopt_value => as {};
-
   implements _build_name => as { shift->attribute->name };
 
-  implements _build_value_string => as {
-    my($self) = @_;
-    return $self->has_value? $self->value : '';
-  };
-
   implements _build_label => as {
     join(' ', map { ucfirst } split('_', shift->name));
   };
@@ -35,11 +28,11 @@ class Field is 'Reaction::UI::ViewPort', which {
 
   implements _model_has_value => as {
     my ($self) = @_;
-    my $predicate = $self->attribute->predicate;
+    my $predicate = $self->attribute->get_predicate_method;
 
     if (!$predicate || $self->model->$predicate
-        || ($self->attribute->is_lazy
-            && !$self->attribute->is_lazy_fail)
+        #|| ($self->attribute->is_lazy
+        #    && !$self->attribute->is_lazy_fail)
       ) {
       # either model attribute has a value now or can build it
       return 1;
@@ -53,7 +46,7 @@ class Field is 'Reaction::UI::ViewPort', which {
     # the model and DBIC can have nullable fields and DBIC doesn't
     # have a way to tell us that doesn't force value inflation (extra
     # SELECTs for belongs_to) so basically we're screwed.
-    return ($self->_model_has_value && defined($self->value)
+    return ($self->_model_has_value && defined($self->_build_value)
               ? $self->_value_string_from_value
               : $self->_empty_string_value);
   };
@@ -64,6 +57,10 @@ class Field is 'Reaction::UI::ViewPort', which {
 
   implements _empty_string_value => as { '' };
 
+  implements value_is_required => as {
+    shift->attribute->is_required;
+  };
+
 };
 
 1;