Reorder the way we look for stringification column.

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

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 6671d09cb5c7ff06859be39735ca44acd255b5de..4321ad8e978b940135cc72ef9424d55ed0e6bffa 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -1,12 +1,13 @@
 package Maypole::Model::CDBI;
 use base qw(Maypole::Model::Base Class::DBI);
-use Lingua::EN::Inflect::Number qw(to_PL);
 use Class::DBI::AsForm;
 use Class::DBI::FromCGI;
 use Class::DBI::Loader;
 use Class::DBI::AbstractSearch;
 use Class::DBI::Plugin::RetrieveAll;
 use Class::DBI::Pager;
+
+use Lingua::EN::Inflect::Number qw(to_PL);
 use CGI::Untaint;
 use strict;
 
@@ -25,6 +26,7 @@ modules.
 
 sub related {
     my ($self, $r) = @_;
+
     # Has-many methods; XXX this is a hack
     map {to_PL($_)} 
     grep { exists $r->{config}{ok_tables}{$_} }
@@ -59,14 +61,14 @@ sub delete :Exported {
     $_->SUPER::delete for @{ $r->objects || [] };
     $r->objects([ $self->retrieve_all ]);
     $r->{template} = "list";
-    $self->list;
+    $self->list($r);
 }
 
 sub stringify_column {
     my $class = shift;
     return ($class->columns("Stringify"),
-                (grep { $_ ne "id" } $class->primary_columns),
-                (grep { $_ eq "name" } $class->columns)
+                (grep { /(name|title)/i } $class->columns),
+                (grep { !/id$/i } $class->primary_columns),
                )[0];
 }
 
@@ -88,9 +90,13 @@ 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");
+    if (!%values) { return $self->list($r) }
+    my $order = $self->order($r);
+    $self = $self->do_pager($r);
+    $r->objects([ $self->search_where(\%values), 
+                  ($order ? { order => $order } : ())  
+                ]);
     $r->{template_args}{search} = 1;
 }
 
@@ -101,15 +107,22 @@ sub do_pager {
     } else { return $self } 
 }
 
-sub list :Exported {
+sub order {
     my ($self, $r) = @_;
-    my %ok_columns = map {$_ => 1} $self->columns;
-    $self = $self->do_pager($r);
     my $order;
+    my %ok_columns = map {$_ => 1} $self->columns;
     if ($order = $r->query->{order} and $ok_columns{$order}) {
-        $r->objects([ $self->retrieve_all_sorted_by( $order.
-            ($r->query->{o2} eq "desc" && " DESC")
-        )]);
+       $order .= ($r->query->{o2} eq "desc" && " DESC")
+    }
+    $order;
+}
+
+sub list :Exported {
+    my ($self, $r) = @_;
+    my $order = $self->order($r);
+    $self = $self->do_pager($r);
+    if ($order) { 
+        $r->objects([ $self->retrieve_all_sorted_by( $order )]);
     } else {
         $r->objects([ $self->retrieve_all ]);
     }