X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FBase.pm;h=753430a20742c292de347c35b7e7dc56ea4124a3;hb=8e96ebeddb37ef30d2e215f935e136a9170576cd;hp=3164c0110ef8a25369a9dd19d1cd55c304439e18;hpb=2c41363d0f5abf35c8d642db4b837f52f5954b2c;p=maypole.git diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm index 3164c01..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,7 +16,6 @@ sub paths { } my @output = (); foreach my $path (@$root) { - push(@output, $path); push(@output, ( $r->model_class @@ -23,15 +23,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; @@ -41,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; @@ -55,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.