X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fmacros;h=357c32981ec708da0829db2b4de4e3c58d134d9e;hb=ac3667d9b110af5c5150e8c18fbad42f80324a29;hp=0aeea7623b8b9f16c60a1c9c1b691f6db241fda6;hpb=c88a8636e6a515a7d3a2ffc3e497a80103f237d0;p=maypole.git diff --git a/templates/factory/macros b/templates/factory/macros index 0aeea76..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"; "