fix for http://rt.cpan.org/Ticket/Display.html?id=14566

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

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 4ed0aa68b331179ace9c43f7ec516c9338a2759a..c80a2902e0ad69cd74bb507a4abd56d43dfbb25a 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -1,6 +1,10 @@
 package Maypole::Model::CDBI;
 use base qw(Maypole::Model::Base Class::DBI);
 use Class::DBI::AsForm;
+# use Maypole::Form::CDBI;
+use CGI::Untaint;
+# use Maypole::Form;
+
 use Class::DBI::FromCGI;
 use Class::DBI::Loader;
 use Class::DBI::AbstractSearch;
@@ -8,7 +12,7 @@ use Class::DBI::Plugin::RetrieveAll;
 use Class::DBI::Pager;
 
 use Lingua::EN::Inflect::Number qw(to_PL);
-use CGI::Untaint;
+
 use strict;
 
 =head1 NAME
@@ -87,7 +91,7 @@ sub related_class {
                   $self->meta_info( has_a    => $accessor ) ||
                   return;
 
-    my $mapping = $related->{args}->{mapping};
+    my $mapping = $related->{args}->{mapping} || [];
     if ( @$mapping ) {
         return $related->{foreign_class}->meta_info('has_a')->{ $$mapping[0] }
           ->{foreign_class};
@@ -119,7 +123,9 @@ sub do_edit : Exported {
                     { required => $r->{config}{ $r->{table} }{required_cols} || [], }
             );
         };
-        $fatal = $@;
+        if ($fatal = $@) {
+            warn "$fatal" if $r->debug;
+        }
         $creating++;
     }
     if ( my %errors = $fatal ? (FATAL => $fatal) : $obj->cgi_update_errors ) {
@@ -134,7 +140,7 @@ sub do_edit : Exported {
     else {
         $r->{template} = "view";
     }
-    $r->objects( [$obj] );
+    $r->objects( $obj ? [$obj] : []);
 }
 
 sub delete : Exported {
@@ -150,6 +156,7 @@ sub stringify_column {
     my $class = shift;
     return (
         $class->columns("Stringify"),
+        ( grep { /^(name|title)$/i } $class->columns ),
         ( grep { /(name|title)/i } $class->columns ),
         ( grep { !/id$/i } $class->primary_columns ),
     )[0];
@@ -200,12 +207,12 @@ sub do_pager {
 
 sub order {
     my ( $self, $r ) = @_;
-    my $order;
     my %ok_columns = map { $_ => 1 } $self->columns;
-    if ( $order = $r->query->{order} and $ok_columns{$order} ) {
-        $order .= ( $r->query->{o2} eq "desc" && " DESC" );
-    }
-    $order;
+    my $q = $r->query;
+    my $order = $q->{order};
+    return unless $order and $ok_columns{$order};
+    $order .= ' DESC' if $q->{o2} and $q->{o2} eq 'desc';
+    return $order;
 }
 
 sub list : Exported {
@@ -234,7 +241,7 @@ sub setup_database {
             dsn       => $dsn,
             user      => $u,
             password  => $p,
-            options   => $opts,
+           %$opts,
         )
     );
     $config->{classes} = [ $config->{loader}->classes ];