changed template path ordering a bit more in TT

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

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 277a0c93d95dcb30db2649acd57db9f1548e7957..0e9378fd465d15cbd60613304fb44f9456f7eba3 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -10,13 +10,13 @@ sub new { bless {}, shift }    # By default, do nothing.
 
 sub paths {
     my ( $self, $r ) = @_;
+    warn "paths called with @_";
     my $root = $r->config->template_root || $r->get_template_root;
     if(ref($root) ne 'ARRAY') {
        $root = [ $root ];
     }
     my @output = ();
     foreach my $path (@$root) {
-       push(@output, $path);
        push(@output,
             (
               $r->model_class
@@ -24,15 +24,13 @@ sub paths {
              )
             );
        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 ) = @_;
     my $class = $r->model_class;
@@ -57,7 +55,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.