Paging support for searches too.

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

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 34aa7417d10a0880f863d6241979a28db7b04d91..bb72f59c4d779561a0ec82bb696c2391b4b6a257 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -56,6 +56,7 @@ 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 || [] };
     $r->objects([ $self->retrieve_all ]);
@@ -81,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.