r20384@hades (orig r523): wreis | 2008-01-26 12:21:51 -0300

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

diff --git a/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseOne.pm b/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseOne.pm
index 12d6d11..76802ef 100644 (file)
--- a/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseOne.pm
+++ b/lib/Reaction/UI/ViewPort/Field/Mutable/ChooseOne.pm
@@ -1,6 +1,7 @@
 package Reaction::UI::ViewPort::Field::Mutable::ChooseOne;
 
 use Reaction::Class;
+use Scalar::Util ();
 
 class ChooseOne is 'Reaction::UI::ViewPort::Field', which {
 
@@ -14,15 +15,32 @@ class ChooseOne is 'Reaction::UI::ViewPort::Field', which {
     my $value = shift;
     if (defined $value) {
       $value = $self->str_to_ident($value) if (!ref $value);
-      my $checked = $self->attribute->check_valid_value($self->action, $value);
-      confess "${value} is not a valid value" unless defined($checked);
+      my $attribute = $self->attribute;
+      my $checked = $attribute->check_valid_value($self->model, $value);
+      unless (defined $checked) {
+        require Data::Dumper; 
+        my $serialised = Data::Dumper->new([ $value ])->Indent(0)->Dump;
+        $serialised =~ s/^\$VAR1 = //; $serialised =~ s/;$//;
+        confess "${serialised} is not a valid value for ${\$attribute->name} on "
+                ."${\$attribute->associated_class->name}";
+      }
       $value = $checked;
     }
     $orig->($self, $value);
   };
 
+  around _value_string_from_value => sub {
+    my $orig = shift;
+    my $self = shift;
+    my $value = $self->$orig(@_);
+    return $self->obj_to_name($value->{value}) if Scalar::Util::blessed($value);
+    return $self->obj_to_name($value) if blessed $value;
+    return "$value"; # force stringify. might work. probably won't.
+  };
+
   implements is_current_value => as {
     my ($self, $check_value) = @_;
+    return unless $self->has_value;
     my $our_value = $self->value;
     return unless ref($our_value);
     $check_value = $self->obj_to_str($check_value) if ref($check_value);