X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=templates%2Ffactory%2Fmacros;h=357c32981ec708da0829db2b4de4e3c58d134d9e;hb=72ebd12372713c17bb79d6510f3da7c7b4561338;hp=06f57735b99709da092c3d9a411c4185574b6393;hpb=4c0d8f0266ab4acd371955c3bf3cdc9c080ea1c9;p=maypole.git diff --git a/templates/factory/macros b/templates/factory/macros index 06f5773..357c329 100644 --- a/templates/factory/macros +++ b/templates/factory/macros @@ -13,7 +13,9 @@ 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; @@ -52,7 +54,7 @@ for some. #%] [% MACRO display_line(item) BLOCK; - FOR col = classmetadata.columns; + FOR col = classmetadata.list_columns; NEXT IF col == "id"; "