X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FBase.pm;h=753430a20742c292de347c35b7e7dc56ea4124a3;hb=8e96ebeddb37ef30d2e215f935e136a9170576cd;hp=9615950d0bf141babecac61003218050f6e9bed7;hpb=1832705643db5a1ca965d83db327dc5c7ec73ad1;p=maypole.git

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 9615950..753430a 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;
@@ -15,21 +16,19 @@ sub paths {
     }
     my @output = ();
     foreach my $path (@$root) {
-	push(@output, $path);
 	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" ));
+	push(@output, $path);
 	push(@output, File::Spec->catdir( $path, "factory" ));
     }
-    return @output;
-}
-
-
 
+    return grep( $_, @output);
+}
 
 sub vars {
     my ( $self, $r ) = @_;
@@ -40,10 +39,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;
@@ -54,7 +54,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.
@@ -73,8 +73,6 @@ sub vars {
 
 sub process {
     my ( $self, $r ) = @_;
-    $r->{content_type}      ||= "text/html";
-    $r->{document_encoding} ||= "utf-8";
     my $status = $self->template($r);
     return $self->error($r) if $status != OK;
     return OK;
@@ -83,38 +81,41 @@ sub process {
 sub error {
     my ( $self, $r, $desc ) = @_;
     $desc = $desc ? "$desc: " : "";
-    carp $desc . $r->{error};
     if ( $r->{error} =~ /not found$/ ) {
-
+	warn "template not found error : ", $r->{error};
         # This is a rough test to see whether or not we're a template or
         # a static page
         return -1 unless @{ $r->{objects} || [] };
 
+	my $template_error = $r->{error};
         $r->{error} = <<EOF;
+<h1> Template not found </h1>
 
-<H1> Template not found </H1>
-
-This template was not found while processing the following request:
+A template was not found while processing the following request:
 
-<B>@{[$r->{action}]}</B> on table <B>@{[ $r->{table} ]}</B> with objects:
+<strong>@{[$r->{action}]}</strong> on table
+<strong>@{[ $r->{table} ]}</strong> with objects:
 
-<PRE>
+<pre>
 @{[join "\n", @{$r->{objects}}]}
-</PRE>
+</pre>
+
 
-Looking for template <B>@{[$r->{template}]}</B> in paths:
+The main template is <strong>@{[$r->{template}]}</strong>.
+The template subsystem's error message was
+<pre>
+$template_error
+</pre>
+We looked in paths:
 
-<PRE>
+<pre>
 @{[ join "\n", $self->paths($r) ]}
-</PRE>
+</pre>
 EOF
         $r->{content_type} = "text/html";
         $r->{output}       = $r->{error};
         return OK;
     }
-    $r->{content_type} = "text/plain";
-    $r->{output}       = $r->{error};
-    $r->send_output;
     return ERROR;
 }