X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fmacros;h=357c32981ec708da0829db2b4de4e3c58d134d9e;hb=fef379e5f473ed4f21f9dc5fa6c36bf46a6b9729;hp=edae5c1a61647b0c5dacd3a173823c3e783d5229;hpb=e793ec2894c5a4eaf0b1b976e838c8b8985b593e;p=maypole.git diff --git a/templates/factory/macros b/templates/factory/macros index edae5c1..357c329 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,7 +33,6 @@ 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); @@ -53,20 +54,22 @@ for some. #%] [% MACRO display_line(item) BLOCK; - FOR col = classmetadata.columns; + FOR col = classmetadata.list_columns; NEXT IF col == "id"; "