X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FBase.pm;h=f21e77135ac77d91d02ccfd8480e992d1e00ad73;hb=70a0d09c3f228f792775b4ac03894d0d37b5c444;hp=a2718c47e53d34f51aba11ccbc0bd99e618d2823;hpb=3ed98309a0852fc198f9e4d0e6f70c5510c8282f;p=maypole.git

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index a2718c4..f21e771 100644
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -1,4 +1,5 @@
 package Maypole::View::Base;
+use Class::C3;
 use File::Spec;
 use UNIVERSAL::moniker;
 use strict;
@@ -19,7 +20,7 @@ sub paths {
 	push(@output,
 	     (
               $r->model_class
-	      && File::Spec->catdir( $path, $r->model_class->moniker )
+	      && File::Spec->catdir( $path, $r->model_class->table )
 	      )
 	     );
 	push(@output, File::Spec->catdir( $path, "custom" ));
@@ -41,10 +42,11 @@ sub vars {
         request => $r,
         objects => $r->objects,
         base    => $base,
-        config  => $r->config
-
-          # ...
+        config  => $r->config,
     );
+
+    $args{object} = $r->object if ($r->can('object'));
+
     if ($class) {
         my $classmeta = $r->template_args->{classmetadata} ||= {};
         $classmeta->{name}              ||= $class;
@@ -55,7 +57,7 @@ sub vars {
         $classmeta->{related_accessors} ||= [ $class->related($r) ];
         $classmeta->{moniker}           ||= $class->moniker;
         $classmeta->{plural}            ||= $class->plural_moniker;
-        $classmeta->{cgi}               ||= { $class->to_cgi };
+        $classmeta->{cgi}               ||= { $class->to_cgi } if ($r->build_form_elements);
 	$classmeta->{stringify_column}  ||= $class->stringify_column;
 
         # User-friendliness facility for custom template writers.