X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=templates%2Ffactory%2Fmacros;h=367d74faaeaea8e69bfcab9163754694e03c01f1;hb=e72c221ab5ef5973233bbfb2fa710c993f2be87d;hp=e7396d3365d3732d568d494d6e3d5a469cba7042;hpb=5b439f6cd78f1565e380151e102f05941cd02fd6;p=maypole.git

diff --git a/templates/factory/macros b/templates/factory/macros
index e7396d3..367d74f 100644
--- a/templates/factory/macros
+++ b/templates/factory/macros
@@ -7,7 +7,7 @@ system.
 
 =head2 link
 
-This creates an <A HREF="... to a command in the Apache::MVC system by
+This creates an <A HREF="..."> to a command in the Apache::MVC system by
 catenating the base URL, table, command, and any arguments.
 
 #%]
@@ -34,7 +34,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
+    IF object.isa('Maypole::Model::Base');
         link(object.table, "view", object.id.join('/'), object);
     ELSE;
         object;
@@ -81,9 +81,11 @@ This is a generic button, which performs an action on an object.
 
 #%]
 [% MACRO button(obj, action) BLOCK; %]
+[% IF obj.is_public(action) %]
 <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 %]
+[% END %]
 [%#
 
 =head2 view_related