There goes 1.4.

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

diff --git a/lib/Maypole/Model/Base.pm b/lib/Maypole/Model/Base.pm
index d092e502dd33ae61866d3d43c80d7d32528cdcb1..6e60aea7f9c3f4505b93263eaa31fcef4dc240d2 100644 (file)
--- a/lib/Maypole/Model/Base.pm
+++ b/lib/Maypole/Model/Base.pm
@@ -9,12 +9,16 @@ sub edit :Exported { }
 sub process {
     my ($class, $r) = @_;
     my $method = $r->action;
-    $r->{template} ||= $method; # Authentication may have done this for us
-    $r->objects([ $class->retrieve(shift @{$r->{args}}) ]);
-
-    # This allows the authentication mechanism to set the template
-    # without needing to define an action.
-    $class->$method($r) if $class->can($method);
+    return if $r->{template}; # Authentication has set this, we're done.
+
+    $r->{template} = $method;
+    $r->objects([]);
+    my $obj = $class->retrieve( $r->{args}->[0] );
+    if ($obj) {
+        $r->objects([ $obj ]);
+        shift @{$r->{args}};
+    }
+    $class->$method($r, $obj, @{$r->{args}});
 }
 
 sub display_columns { 
@@ -121,7 +125,7 @@ Return a hash mapping column names with human-readable equivalents.
 
 sub column_names { my $class = shift; map { 
         my $col = $_;
-        $col =~ s/_+(\w)?/ \U\1/g;
+        $col =~ s/_+(\w)?/ \U$1/g;
         $_ => ucfirst $col } $class->columns }
 
 =head2 description