X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2Ftemplates%2Ffactory%2Fmacros;h=8267d926de4a157445a6934dccab74163625fee3;hb=dd369c8a18080c4f27237f23b5842d53da05f570;hp=53f6952dcc82809f33fedab92425d7cfd319e5b7;hpb=446373ada20165687d0c3b03a2ee18c08831be02;p=maypole.git

diff --git a/lib/Maypole/templates/factory/macros b/lib/Maypole/templates/factory/macros
index 53f6952..8267d92 100644
--- a/lib/Maypole/templates/factory/macros
+++ b/lib/Maypole/templates/factory/macros
@@ -14,7 +14,7 @@ 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;
+    lnk = lnk | uri ;
     '<a href="' _ lnk _ '">';
     label | html;
     "</a>";
@@ -138,7 +138,7 @@ This takes an object and and displays its properties in a table.
     [% INCLUDE navbar %]
     <table class="view">
         <tr>
-            <td class="field">[% classmetadata.colnames.$string %]</td>
+            <td class="field">[% classmetadata.colnames.$string  %]</td>
             <td>[% item.$string | html %]</td>
         </tr>
         [% FOR col = classmetadata.columns.list;
@@ -154,11 +154,18 @@ from the C<column_names> method:
 
 #%]
             <tr>
-                <td class="field">[% classmetadata.colnames.$col; %]</td>
+                <td class="field">[% classmetadata.colnames.$col || 
+                     col | ucfirst | replace('_',' '); %]</td>
                 <td>
                     [% IF col == "url" && item.url;  # Possibly too much magic.
                         '<a href="'; item.url | html ; '"> '; item.url; '</a>';
+					ELSIF item.$col.size > 1; # has_many column
+						FOR thing IN item.$col; 
+							maybe_link_view(thing);",  ";
+						 END;
+
                     ELSE;
+					
                         maybe_link_view(item.$col); 
                     END; %]
 [%#