X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI.pm;h=bb72f59c4d779561a0ec82bb696c2391b4b6a257;hb=ce776d474df109def560a589e8f08af965b3c45e;hp=b2e592973fa875c2b33ca60d23913335d647d636;hpb=f9f34047115475e7ca94d8c53273d1b3388cc33d;p=maypole.git

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index b2e5929..bb72f59 100644
--- 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";
 }
@@ -65,11 +66,14 @@ sub delete :Exported {
 sub adopt {
     my ($self, $child) = @_;
     $child->autoupdate(1);
-    $child->columns( Stringify => qw/ name / );
+    if (grep { $_ eq "name" } $child->columns) { # Common case
+        $child->columns( Stringify => qw/ name / );
+    } # Otherwise, work it out for yourself.
 }
 
 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
@@ -78,18 +82,23 @@ sub search :Exported {
     my %values = map { $_ => {$oper, $params{$_} } }
                  grep { $params{$_} and $fields{$_} } keys %params;
 
+    $self = $self->do_pager($r);
     $r->objects([ %values ? $self->search_where(%values) : $self->retrieve_all ]);
     $r->template("list");
     $r->{template_args}{search} = 1;
 }
 
+sub do_pager {
+    my ($self, $r) = @_;
+    if ( my $rows = $r->config->{rows_per_page}) {
+        return $r->{template_args}{pager} = $self->pager($rows, $r->query->{page});
+    } else { return $self } 
+}
+
 sub list :Exported {
     my ($self, $r) = @_;
     my %ok_columns = map {$_ => 1} $self->columns;
-    if ( my $rows = $r->config->{rows_per_page}) {
-        $self = $self->pager($rows, $r->query->{page});
-        $r->{template_args}{pager} = $self;
-    } 
+    $self = $self->do_pager($r);
     my $order;
     if ($order = $r->query->{order} and $ok_columns{$order}) {
         $r->objects([ $self->retrieve_all_sorted_by( $order.