related() patch from Marcus.

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

diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm
index 495439e4e5df5ed5dd64db0a54150cdca6ea9631..cbecaf1bebf82e2adf1b5d5891b938e10ac7e9ea 100644 (file)
--- a/lib/Maypole/Model/CDBI.pm
+++ b/lib/Maypole/Model/CDBI.pm
@@ -26,28 +26,27 @@ 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);
     } else {
         $obj = $self->create_from_cgi($h);
+        $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";
     }
@@ -66,8 +65,8 @@ sub delete :Exported {
 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];
 }