]> git.decadent.org.uk Git - maypole.git/commitdiff
projects / maypole.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c219455)
fixed error template in TT.pm and possible work around for ->object to work
authorAaron Trevena <aaron.trevena@gmail.com>
Mon, 12 Jun 2006 14:25:36 +0000 (14:25 +0000)
committerAaron Trevena <aaron.trevena@gmail.com>
Mon, 12 Jun 2006 14:25:36 +0000 (14:25 +0000)
git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@493 48953598-375a-da11-a14b-00016c27c3ee

lib/Maypole.pm patch | blob | history
lib/Maypole/View/Base.pm patch | blob | history
lib/Maypole/View/TT.pm patch | blob | history

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 5837848df1c59e3ebeebec65aab5ef94dff1d744..770467a0b83a6e8e77d94e3a15521a2506df77cd 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -955,8 +955,6 @@ sub send_output {
 }
 
 
-
-
 =back
 
 =head2 Path processing and manipulation
diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 1cc9b2bd8f78a9efc906275991eee2765ffb310e..5a99580e514f01a0c914f677a2b96a8028cfc47a 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -42,10 +42,10 @@ sub vars {
         objects => $r->objects,
         base    => $base,
         config  => $r->config,
-       object  => $r->object,
-
-          # ...
     );
+
+    $args{object} = $r->object if ($r->can('object'));
+
     if ($class) {
         my $classmeta = $r->template_args->{classmetadata} ||= {};
         $classmeta->{name}              ||= $class;
diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index a1484d5eab77a2b030f230c0e322cb1a2ef8508a..78aad9325199f07101d71afbffa116540d2f9cac 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -49,6 +49,9 @@ sub template {
 sub report_error {
     my ($self, $r, $error, $type) = @_;
     my $output;
+
+    warn "self : $self, r : $r, error : $error, type : $type\n";
+
     # Need to be very careful here.
     my $tt = Template->new;
     unless (ref $r->{config}) {
@@ -60,7 +63,8 @@ sub report_error {
                     { err_type => $type, error => $error,
                       config => $r->{config},
                       request => $r,
-        eval{$self->vars($r)} }, \$output )) {
+                      paths => $self->paths($r),
+                      eval{$self->vars($r)} }, \$output )) {
         $r->{output} = $output;
         if ($tt->error) { $r->{output} = "<html><body>Even the error template
         errored - ".$tt->error."</body></html>"; }
@@ -399,23 +403,27 @@ the path "[% request.path %]". The error text returned was:
 
 <h2> Request details </h2>
 
-<table>
+<table width="85%" cellspacing="2" cellpadding="1">
     [% FOR attribute = ["model_class", "table", "template", "path",
     "content_type", "document_encoding", "action", "args", "objects"] %]
-    <tr> <td class="lhs"> [% attribute %] </td> <td class="rhs"> [%
+    <tr> <td class="lhs" width="35%"> <b>[% attribute %]</b> </td> <td class="rhs" width="65%"> [%
     request.$attribute.list.join(" , ") %] </td></tr>
     [% END %]
 </table>
 
+<h2> Website / Template Paths </h2>
+<table width="85%" cellspacing="2" cellpadding="1">
+<tr><td class="lhs" width="35%"> <b>Base URI</b> </td><td class="rhs" width="65%">[% request.config.uri_base %]</td></tr>
+<tr><td class="lhs" width="35%"> <b>Paths</b> </td><td class="rhs" width="65%"> [% paths %] </td></tr>
+</table>
+
 <h2> Application configuration </h2>
-<table>
-    [% FOR field IN config %]
-    <tr> <td class="lhs"> [% field.key %] </td> <td class="rhs"> [% 
-    $field.value.list.join(" , ") %] </td></tr>
-    [% END %]
+<table width="85%" cellspacing="2" cellpadding="1">
+    <tr><td class="lhs"  width="35%"> <b>Model </b> </td><td class="rhs" width="65%"> [% request.config.model %] </td></tr>
+    <tr><td class="lhs"  width="35%"> <b>View </b> </td><td class="rhs" width="65%"> [% request.config.view %] </td></tr>
+    <tr><td class="lhs" width="35%"> <b>Classes</b> </td><td class="rhs" width="65%"> [% request.config.classes.list.join(" , ") %] </td></tr>
+    <tr><td class="lhs" width="35%"> <b>Tables</b> </td><td class="rhs" width="65%"> [% request.config.display_tables.list.join(" , ") %] </td></tr>
 </table>
 
 </body>
 </html>
-
-
Package: Maypole [unmaintained]