X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC%2FModel%2FCDBI.pm;h=695e1cbd7dec1fe0e6e6f9ed33863113df0b2c90;hb=d635ca733a7199c4f9893e8d5a50e96a1295f092;hp=86b2d344c23f93d284a4d53336fb6eddef0d3ab9;hpb=764903e283216b27eda8c60aeda8549d5e6f6b32;p=maypole.git

diff --git a/lib/Apache/MVC/Model/CDBI.pm b/lib/Apache/MVC/Model/CDBI.pm
index 86b2d34..695e1cb 100644
--- a/lib/Apache/MVC/Model/CDBI.pm
+++ b/lib/Apache/MVC/Model/CDBI.pm
@@ -1,5 +1,6 @@
 package Apache::MVC::Model::CDBI;
-use base 'Apache::MVC::Model::Base';
+use base qw(Apache::MVC::Model::Base Class::DBI);
+use Lingua::EN::Inflect::Number qw(to_PL);
 use Class::DBI::AsForm;
 use Class::DBI::FromCGI;
 use CGI::Untaint;
@@ -13,13 +14,21 @@ sub get_objects {
     return $self->retrieve(shift @{$r->{args}});
 }
 
+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 || {}}
+}
+
 sub do_edit :Exported {
     my ($self, $r) = @_;
     my $h = CGI::Untaint->new(%{$r->{params}});
-    my $obj;
-    if (@{$r->{args}}) {
+    my ($obj) = @{$r->objects};
+    if ($obj) {
         # We have something to edit
-        ($obj) = @{$self->objects};
         $obj->update_from_cgi($h);
         warn "Updating an object ($obj) with ".Dumper($h); use Data::Dumper;
     } else {
@@ -39,7 +48,7 @@ sub do_edit :Exported {
 
 sub delete :Exported {
     my ($self, $r) = @_;
-    $self->delete for @{ $r->objects };
+    $_->SUPER::delete for @{ $r->objects };
     $r->objects([ $self->retrieve_all ]);
     $r->{template} = "list";
 }