X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FModel%2FCDBI.pm;h=2a79850805008930c4f461e734c5bcb5a15d0161;hb=5c199c0e9cd05a00bfc04d9688982979a41f3ee8;hp=b2a79b494d8699d6fa677625891e4d9136c28cbe;hpb=6ff5b7a2c092e585299110ec243a4f839c9c5cec;p=maypole.git

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index b2a79b4..2a79850 100644
--- 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,28 +26,31 @@ modules.
 
 sub related {
     my ($self, $r) = @_;
-    # Has-many methods; XXX this is a hack
-    map {to_PL($_)} 
-    grep { exists $r->{config}{ok_tables}{$_} }
-    map {$_->table}
-    keys %{shift->__hasa_list || {}}
+    return keys %{$self->meta_info('has_many') || {}};
 }
 
 sub do_edit :Exported {
     my ($self, $r) = @_;
     my $h = CGI::Untaint->new(%{$r->{params}});
+    my $creating = 0;
     my ($obj) = @{$r->objects || []};
     if ($obj) {
         # We have something to edit
-        $obj->update_from_cgi($h);
+        $obj->update_from_cgi($h => {
+           required => $r->{config}{$r->{table}}{required_cols} || [],
+                                    });
     } else {
-        $obj = $self->create_from_cgi($h);
+        $obj = $self->create_from_cgi($h => {
+           required => $r->{config}{$r->{table}}{required_cols} || [],
+                                    });
+        $creating++;
     }
     if (my %errors = $obj->cgi_update_errors) {
         # Set it up as it was:
         $r->{template_args}{cgi_params} = $r->{params};
         $r->{template_args}{errors} = \%errors;
         $r->{template} = "edit";
+        undef $obj if $creating; # Couldn't create
     } else {
         $r->{template} = "view";
     }
@@ -59,14 +63,23 @@ sub delete :Exported {
     $_->SUPER::delete for @{ $r->objects || [] };
     $r->objects([ $self->retrieve_all ]);
     $r->{template} = "list";
+    $self->list($r);
+}
+
+sub stringify_column {
+    my $class = shift;
+    return ($class->columns("Stringify"),
+                (grep { /(name|title)/i } $class->columns),
+                (grep { !/id$/i } $class->primary_columns),
+               )[0];
 }
 
 sub adopt {
     my ($self, $child) = @_;
     $child->autoupdate(1);
-    if (grep { $_ eq "name" } $child->columns) { # Common case
-        $child->columns( Stringify => qw/ name / );
-    } # Otherwise, work it out for yourself.
+    if (my $col = $child->stringify_column) {
+        $child->columns( Stringify => $col );
+    }
 }
 
 sub search :Exported {
@@ -79,9 +92,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;
 }
 
@@ -92,28 +109,40 @@ 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 ]);
     }
 }
 
 sub setup_database {
-    my ($self, $config, $namespace, $dsn, $u, $p) = @_;
+    my ($self, $config, $namespace, $dsn, $u, $p, $opts) = @_;
+    $dsn  ||= $config->{dsn};
+    $u    ||= $config->{user};
+    $p    ||= $config->{pass};
+    $opts ||= $config->{opts};
     $config->{dsn} = $dsn;
     $config->{loader} = Class::DBI::Loader->new(
         namespace => $namespace,
         dsn => $dsn,
         user => $u,
         password => $p,
+        options => $opts,
     );
     $config->{classes} = [ $config->{loader}->classes ];
     $config->{tables}  = [ $config->{loader}->tables ];