applied patch from nicg : Modified MVC.pm to correct problem with LocationMatch and...

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@555 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index 372769a604b6280ae5e0a137426e443f6ec309a4..977dd0a94026e77da3f666fb3cfd1d6d64020a3e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -23,6 +23,7 @@ For information about current developments and future releases, see:
    fixed template path with array refs
    fix to template being reset from path in plain templates (i.e. where no model), may affect those relying on the bug ( bug 23722 )
    added search_columns method to base cdbi model class, provides display_columns unless over-ridden
+   fix to display_line macro in factory templates (bug 22920)
 
 2.11 Mon 31 July 2006
 

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 831527639e58336d5cb0afb8af647cbeaf1fb5eb..384b497d28154b8a98c48f67141f3c2339df71e7 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -134,7 +134,8 @@ sub parse_location {
     }
 
     my $path = $self->ar->uri;
-    my $loc  = $self->ar->location;
+    my $base  = URI->new($self->config->uri_base);
+    my $loc = $base->path;
 
     {
         no warnings 'uninitialized';

diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index 936fcc51fc8fa7668a3a5a29b3a7d8bfb4cedc41..d2da45a59d0b643e4ec4f2c322af717b595140e3 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -8,7 +8,7 @@ use File::Spec::Functions qw(catdir tmpdir);
 our $error_template;
 { local $/; $error_template = <DATA>; }
 
-our $VERSION = '2.11';
+our $VERSION = '2.12';
 
 use strict;
 
@@ -16,6 +16,9 @@ sub template {
   my ( $self, $r ) = @_;
   unless ($self->{tt}) {
     my $view_options = $r->config->view_options || {};
+    if ($r->debug) {
+      $view_options->{DEBUG} = 'undef';
+    }
     $self->{provider} = Template::Provider->new($view_options);
     $self->{tt}       = Template->new({
                                       %$view_options,

diff --git a/lib/Maypole/templates/factory/list b/lib/Maypole/templates/factory/list
index 9abbc0104ad16a405f1f0596f23968e757d51905..8b9052ee7dcc91a87672fe93353c452b5668db45 100644 (file)
--- a/lib/Maypole/templates/factory/list
+++ b/lib/Maypole/templates/factory/list
@@ -24,7 +24,7 @@
                     SET additional =
                         additional  _ "&" _ name _ "=" _
                         request.params.$name;
-                    SET action = "search";
+                    SET action = "do_search";
                   END;
                 END;
                USE model_obj = Class request.model_class;

diff --git a/lib/Maypole/templates/factory/macros b/lib/Maypole/templates/factory/macros
index c96cb17db8d7818e23b0a04efbbf5273083bd8ce..ce9d0e1d3e837944885b63541dc829d834b1c676 100644 (file)
--- a/lib/Maypole/templates/factory/macros
+++ b/lib/Maypole/templates/factory/macros
@@ -63,8 +63,7 @@ for some.
         ELSIF col == classmetadata.stringify_column;
             maybe_link_view(item);
                ELSIF col_obj; # its a real column
-            accessor = item.accessor_name_for(col_obj) ||
-                                  item.accessor_name(col_obj); # deprecated in cdbi
+            accessor = item.accessor_name_for(col_obj) || item.accessor_name(col_obj); # deprecated in cdbi
             maybe_link_view(item.$accessor);
         ELSE; 
             item.$col;

diff --git a/lib/Maypole/templates/factory/search_form b/lib/Maypole/templates/factory/search_form
index 5d0fd904028cb00d3335d995b1e2e4cb1c7b1d1d..5694f7d9dd6261b0a8fda3943d93dc2bb1908529 100644 (file)
--- a/lib/Maypole/templates/factory/search_form
+++ b/lib/Maypole/templates/factory/search_form
@@ -2,7 +2,7 @@
 <!-- ### Search component ### -->
 
 <div id="search">
-<form method="get" action="[% base %]/[% classmetadata.moniker %]/search/">
+<form method="get" action="[% base %]/[% classmetadata.moniker %]/do_search/">
 <fieldset>
 <legend>Search</legend>
 [% USE search_class = Class request.model_class; %]