support compound primary keys in factory templates

[maypole.git] / templates / factory / macros

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 %]
 [%#