X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI%2FDFV.pm;h=7848759d610a72bc97711b175af01bd196d41704;hb=bd6da5dd49b9a50d49098f97278e4b440cb17bd9;hp=5a74f71848433e00038c55390045806cbffd7702;hpb=753bfd73e7faf3e0cd8ec2468208d4f40dbfd997;p=maypole.git diff --git a/lib/Maypole/Model/CDBI/DFV.pm b/lib/Maypole/Model/CDBI/DFV.pm index 5a74f71..7848759 100644 --- a/lib/Maypole/Model/CDBI/DFV.pm +++ b/lib/Maypole/Model/CDBI/DFV.pm @@ -140,6 +140,7 @@ sub do_edit : Exported { return; } + my $errors; if ($obj) { ($obj,$errors) = $class->_do_update($r,$obj); @@ -151,10 +152,6 @@ sub do_edit : Exported { if (ref $errors) { # pass errors to template $r->template_args->{errors} = $errors; - foreach my $error (keys %$errors) { - $r->template_args->{errors}{ucfirst($error)} = $errors->{$error} - } - # Set it up as it was: $r->template_args->{cgi_params} = $r->params; $r->template("edit"); @@ -182,7 +179,14 @@ sub _do_update { } } - my $this_class_params = { map { $_ => $r->{params}{$_} } $class->columns }; + + my $this_class_params = {}; + foreach my $param ( $class->columns ) { + next if ($param eq $class->columns('Primary')); + my $value = $r->params->{$param}; + next unless (defined $value); + $this_class_params->{$param} = ( $value eq '' ) ? undef : $value; + } # update or make other related (must_have, might_have, has_many etc ) unless ($errors) { @@ -190,7 +194,7 @@ sub _do_update { # get related object if it exists my $rel_meta = $class->related_meta('r',$accssr); if (!$rel_meta) { - $class->_carp("No relationship for $accssr in " . ref($class)); + $r->warn("[_do_update] No relationship for $accssr in " . ref($class)); next; } @@ -212,13 +216,20 @@ sub _do_update { } return ($obj,$errors); - } sub _do_create { my ($class,$r) = @_; my $errors; - my $this_class_params = { map { $_ => $r->{params}{$_} } $class->columns }; + + my $this_class_params = {}; + foreach my $param ( $class->columns ) { + next if ($param eq $class->columns('Primary')); + my $value = $r->params->{$param}; + next unless (defined $value); + $this_class_params->{$param} = ( $value eq '' ) ? undef : $value; + } + my $obj; my $dfv_results = Data::FormValidator->check($r->{params}, $class->dfv_profile); @@ -257,7 +268,7 @@ sub _create_related { my $created = []; my $rel_meta = $self->related_meta('r',$accssr); if (!$rel_meta) { - $self->_carp("No relationship for $accssr in " . ref($self)); + $self->_carp("[_create_related] No relationship for $accssr in " . ref($self)); return; }