support compound primary keys in factory templates

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

diff --git a/Changes b/Changes
index a653e99d7377731dd109c9f95b1f09f39175d2c7..75c2a52171ab3741e72aa7df254b442bdf6601fc 100644 (file)
--- a/Changes
+++ b/Changes
@@ -7,8 +7,10 @@ Revision history for Perl extension Maypole
       Maypole::Model::CDBI::Plain (Dave Howorth)
     - Added Apache::RequestIO to Apache::MVC (michael@diaspora.gen.nz)
     - Applied patch to fix length of utf8 documents.
-    - added a new override for the model, fetch_objects. 
-    - support MCPKs in  CDBI fetch_objects.
+    - added a new override for the model: fetch_objects. 
+    - support compound primary keys in CDBI fetch_objects.
+    - add support for compound primary keys in factory templates
+      (Dagfinn Ilmari Mannsåker)
 
 2.04  Tue Oct 27 14:00:00 2004
     - fixed Apache::MVC version (Randal Schwartz)

diff --git a/templates/factory/macros b/templates/factory/macros
index 357c32981ec708da0829db2b4de4e3c58d134d9e..e7396d3365d3732d568d494d6e3d5a469cba7042 100644 (file)
--- a/templates/factory/macros
+++ b/templates/factory/macros
@@ -35,7 +35,7 @@ command for that object. Otherwise, it just displays the data.
 [%
 MACRO maybe_link_view(object) BLOCK;
     IF object.table; # It's an object, i.e. a has-a
-        link(object.table, "view", object.id, object);
+        link(object.table, "view", object.id.join('/'), object);
     ELSE;
         object;
     END;
@@ -81,7 +81,7 @@ This is a generic button, which performs an action on an object.
 
 #%]
 [% MACRO button(obj, action) BLOCK; %]
-<form class="actionform" action="[% base %]/[% obj.table %]/[% action %]/[% obj.id %]" method="post">
+<form class="actionform" action="[% base %]/[% obj.table %]/[% action %]/[% obj.id.join('/') %]" method="post">
 <div class="field"><input class="actionbutton" type="submit" value="[% action %]" /></div></form>
 [% END %]
 [%#