fixed bug in DFV model when updating object

[maypole.git] / lib / Maypole / Model / CDBI / AsForm.pm

diff --git a/lib/Maypole/Model/CDBI/AsForm.pm b/lib/Maypole/Model/CDBI/AsForm.pm
index 76003ff3cf811d4ea1e44c053a98ef12897ccee7..06f1039f3f1da76866a975733e63dbd0efb9909b 100644 (file)
--- a/lib/Maypole/Model/CDBI/AsForm.pm
+++ b/lib/Maypole/Model/CDBI/AsForm.pm
@@ -983,7 +983,8 @@ sub _to_foreign_inputs {
   my $rel_meta = $args->{related_meta} || $self->related_meta('r',$accssr); 
   my $fields           = $args->{columns};
   if (!$rel_meta) {
-    $self->_croak( "No relationship for accessor $accssr");
+    $self->_carp( "[_to_foreign_inputs] No relationship for accessor $accssr");
+    return;
   }
 
   my $rel_type = $rel_meta->{name};
@@ -1173,11 +1174,13 @@ objects stringify method specified in $args->{stringify} as the content. Otherwi
 sub _options_from_objects {
   my ($self, $items, $args) = @_;
   my $selected = $args->{selected} || {};
-  my $stringify = $args->{stringify};
 
   my @res;
   for my $object (@$items) {
-    $stringify ||= $object->stringify_column;
+    my $stringify = $args->{stringify};
+    if ($object->can('stringify_column') ) {
+      $stringify ||= $object->stringify_column if ($object->can($object->stringify_column));
+    }
     my $id = $object->id;
     my $opt = HTML::Element->new("option", value => $id);
     $id =~ s/^0*//;            # leading zeros no good in hash key
@@ -1194,7 +1197,8 @@ sub _options_from_arrays {
   my $selected = $args->{selected} || {};
   my @res;
   my $class = $args->{class} || '';
-  my $stringify = $args->{stringify} || $self->stringify_column;
+  my $stringify = $args->{stringify};
+  $stringify ||= $self->stringify_column if ($self->can('stringify_column'));
   for my $item (@$items) {
     my @pks;                   # for future multiple key support
     push @pks, shift @$item foreach $class->columns('Primary');
@@ -1251,7 +1255,8 @@ sub _options_from_hashes {
   my $selected = $args->{selected} || {};
   my $pk = eval {$args->{class}->primary_column} || 'id';
   my $fclass = $args->{class} || '';
-  my $stringify = $args->{stringify} || $self->stringify_column;
+  my $stringify = $args->{stringify};
+  $stringify ||= $self->stringify_column if ( $self->can('stringify_column') );
   my @res;
   for my $item (@$items) {
     my $val = defined $item->{$pk} ? $item->{$pk} : '';
@@ -1264,7 +1269,8 @@ sub _options_from_hashes {
       $content = $item->{$stringify};
     } else {
       $content = join(' ', map {$item->{$_} } keys %$item);
-    }  
+    }
+
     $opt->push_content( $content );
     push @res, $opt;
   }