X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI%2FAsForm.pm;h=8a7f06c95e3f8237aad4d82009b0eba928353060;hb=ee812d68b34c0e43d89551e39ebf5b7d247ac5b6;hp=c072dc8d7112e1433e1fd5ef3c062b598947842e;hpb=753bfd73e7faf3e0cd8ec2468208d4f40dbfd997;p=maypole.git diff --git a/lib/Maypole/Model/CDBI/AsForm.pm b/lib/Maypole/Model/CDBI/AsForm.pm index c072dc8..8a7f06c 100644 --- a/lib/Maypole/Model/CDBI/AsForm.pm +++ b/lib/Maypole/Model/CDBI/AsForm.pm @@ -1,6 +1,4 @@ package Maypole::Model::CDBI::AsForm; - -use Class::C3; use strict; use warnings; @@ -882,9 +880,9 @@ sub _to_bool_select { unless (defined $selected); my $a = HTML::Element->new("select", name => $col); - if ($args->{column_nullable} || $args->{value} eq '') { + if ($args->{column_nullable} || !defined $args->{value} ) { my $null = HTML::Element->new("option"); - $null->attr('selected', 'selected') if $args->{value} eq ''; + $null->attr('selected', 'selected') if (!defined $args->{value}); $a->push_content( $null ); } @@ -983,7 +981,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}; @@ -1178,7 +1177,7 @@ sub _options_from_objects { for my $object (@$items) { my $stringify = $args->{stringify}; if ($object->can('stringify_column') ) { - $stringify ||= $object->stringify_column if ($object->can($object->stringify_column)); + $stringify ||= $object->stringify_column if ($object->stringify_column && $object->can($object->stringify_column)); } my $id = $object->id; my $opt = HTML::Element->new("option", value => $id);