X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=templates%2Ffactory%2Fmacros;h=ddd9ffbb10f47cfdb1dd945f9c62dc5f8c843c03;hb=23a69af2f53b2b1a79bd59124c8b15ef7bd9fd67;hp=7e3284c3861196d45be137e0e57b1765ef9a40a3;hpb=ca325e68ce3620b52a3c8c9ed437ed79c5d1a744;p=maypole.git diff --git a/templates/factory/macros b/templates/factory/macros index 7e3284c..ddd9ffb 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; %] @@ -32,8 +34,8 @@ 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.table; # It's an object, i.e. a has-a + link(object.table, "view", object.id, object); ELSE; object; END; @@ -52,20 +54,22 @@ for some. #%] [% MACRO display_line(item) BLOCK; - FOR col = classmetadata.columns; + FOR col = classmetadata.list_columns; NEXT IF col == "id"; "