From: Aaron Trevena Date: Thu, 20 Jul 2006 20:51:59 +0000 (+0000) Subject: small updates to docs, etc X-Git-Tag: 2.11~5 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6fb98ace4f824a32e25cbd161743814892d11408;p=maypole.git small updates to docs, etc git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@515 48953598-375a-da11-a14b-00016c27c3ee --- diff --git a/lib/Maypole.pm b/lib/Maypole.pm index 35347ad..c3e3525 100644 --- a/lib/Maypole.pm +++ b/lib/Maypole.pm @@ -1151,6 +1151,11 @@ sub object { Get/set a hash of template variables. +Maypole reserved words for template variables will over-ride values in template_variables. + +Reserved words are : r, request, object, objects, base, config and errors, as well as the +current class or object name. + =item stash A place to put custom application data. Not used by Maypole itself. diff --git a/lib/Maypole/Model/CDBI/AsForm.pm b/lib/Maypole/Model/CDBI/AsForm.pm index 02403e0..ce26226 100644 --- a/lib/Maypole/Model/CDBI/AsForm.pm +++ b/lib/Maypole/Model/CDBI/AsForm.pm @@ -117,6 +117,8 @@ Maypole::Model:CDBI::AsForm - Produce HTML form elements for database columns . . . + + ##################################################### # Advanced Usage diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index 78aad93..fb94767 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -8,41 +8,40 @@ our $error_template; { local $/; $error_template = ; } use strict; -our $VERSION = 2.11; sub template { - my ( $self, $r ) = @_; - unless ($self->{tt}) { - my $view_options = $r->config->view_options || {}; - $self->{provider} = Template::Provider->new($view_options); - $self->{tt} = Template->new({ - %$view_options, - LOAD_TEMPLATES => [ $self->{provider} ], - }); - } - - $self->{provider}->include_path([ $self->paths($r) ]); - - my $template_file = $r->template; - - my $ext = $r->config->template_extension; - $template_file .= $ext if defined $ext; - - my $output; - my $processed_ok = eval{$self->{tt}->process($template_file, { $self->vars($r) }, \$output );}; - if ($processed_ok) { - $r->{output} = $output; - return OK; + my ( $self, $r ) = @_; + unless ($self->{tt}) { + my $view_options = $r->config->view_options || {}; + $self->{provider} = Template::Provider->new($view_options); + $self->{tt} = Template->new({ + %$view_options, + LOAD_TEMPLATES => [ $self->{provider} ], + }); + } + + $self->{provider}->include_path([ $self->paths($r) ]); + + my $template_file = $r->template; + + my $ext = $r->config->template_extension; + $template_file .= $ext if defined $ext; + + my $output; + my $processed_ok = eval{$self->{tt}->process($template_file, { $self->vars($r) }, \$output );}; + if ($processed_ok) { + $r->{output} = $output; + return OK; + } else { + if ($@) { + warn "fatal error in template '$template_file' : $@\n"; + $r->{error} = "fatal error in template '$template_file' : $@"; } else { - if ($@) { - warn "fatal error in template '$template_file' : $@\n"; - $r->{error} = "fatal error in template '$template_file' : $@"; - } else { - warn "TT error for template '$template_file'\n" . $self->{tt}->error; - $r->{error} = "TT error for template '$template_file'\n" . $self->{tt}->error; - } - return ERROR; + warn "TT error for template '$template_file'\n" . $self->{tt}->error; + $r->{error} = "TT error for template '$template_file'\n" . $self->{tt}->error; } + return ERROR; + } }