X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fmacros;h=4a90e1771f4f1ae9e2c60cb20a2ee009dfaca165;hb=ce6a9545f5fd2fde3490b7172193d31a8ceece2f;hp=234b8f92e512f686ec11fab6e674dedad21781b3;hpb=fc6bc7a48e5d5d7eaedb22497b1c6c8b8193850c;p=maypole.git diff --git a/templates/factory/macros b/templates/factory/macros index 234b8f9..4a90e17 100644 --- a/templates/factory/macros +++ b/templates/factory/macros @@ -34,8 +34,8 @@ 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); + IF object.isa('Maypole::Model::Base'); + link(object.table, "view", object.id.join('/'), object); ELSE; object; END; @@ -54,7 +54,7 @@ for some. #%] [% MACRO display_line(item) BLOCK; - FOR col = classmetadata.columns; + FOR col = classmetadata.list_columns; NEXT IF col == "id"; "