Miscellaneous fixes.

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

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 74653dc6f2d091a4a3638713d8e5c2bfce397def..0be76f98d40e453ba961333006e23aa06e038bf4 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -35,7 +35,7 @@ sub related {
 sub do_edit :Exported {
     my ($self, $r) = @_;
     my $h = CGI::Untaint->new(%{$r->{params}});
-    my ($obj) = @{$r->objects};
+    my ($obj) = @{$r->objects || []};
     if ($obj) {
         # We have something to edit
         $obj->update_from_cgi($h);
@@ -56,8 +56,9 @@ sub do_edit :Exported {
 }
 
 sub delete :Exported {
+    return shift->SUPER::delete(@_) if caller ne "Maypole::Model::Base";
     my ($self, $r) = @_;
-    $_->SUPER::delete for @{ $r->objects };
+    $_->SUPER::delete for @{ $r->objects || [] };
     $r->objects([ $self->retrieve_all ]);
     $r->{template} = "list";
 }
@@ -71,7 +72,8 @@ sub adopt {
 }
 
 sub search :Exported {
-    return shift->SUPER::search(@_) if caller eq "Class::DBI"; # oops
+    return shift->SUPER::search(@_) if caller ne "Maypole::Model::Base";
+                                    # A real CDBI search.
     my ($self, $r) = @_;
     my %fields = map {$_ => 1 } $self->columns;
     my $oper = "like"; # For now