X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=templates%2Ffactory%2Fmacros;h=95dc9730e4a4b31f632f164a84c8a0d0a7d1ab8f;hb=abd21e88bc4d622a7c43c6d04db28be75a4e7c5b;hp=e142916d6dd304aa7af9c3d4e42194375f16c798;hpb=f7e68bd92b9b43454454f9715406b7e0f9b956e1;p=maypole.git diff --git a/templates/factory/macros b/templates/factory/macros index e142916..95dc973 100644 --- a/templates/factory/macros +++ b/templates/factory/macros @@ -13,9 +13,11 @@ catenating the base URL, table, command, and any arguments. #%] [% MACRO link(table, command, additional, label) BLOCK; - ''; + SET lnk = base _ "/" _ table _ "/" _ command _ "/" _ additional; + lnk = lnk | uri | html; + ''; label; - ""; + ""; END; %] @@ -31,10 +33,9 @@ command for that object. Otherwise, it just displays the data. #%] [% - MACRO maybe_link_view(object) BLOCK; - IF object.moniker; # It's an object, i.e. a has-a - link(object.moniker, "view", object.id, object); + IF object.isa('Maypole::Model::Base'); + link(object.table, "view", object.id.join('/'), object); ELSE; object; END; @@ -53,20 +54,22 @@ for some. #%] [% MACRO display_line(item) BLOCK; - FOR col = classmetadata.columns; + FOR col = classmetadata.list_columns; NEXT IF col == "id"; "