X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2Ftemplates%2Ffactory%2Fmacros;h=c96cb17db8d7818e23b0a04efbbf5273083bd8ce;hb=c3973978e1373a262d13da63c9e9ecfde4b72cc7;hp=cbf58bb21902fd0b1f80a907190363aa184ecf1b;hpb=a02686080acb66fce170e9657e110761b09e62a2;p=maypole.git

diff --git a/lib/Maypole/templates/factory/macros b/lib/Maypole/templates/factory/macros
index cbf58bb..c96cb17 100644
--- a/lib/Maypole/templates/factory/macros
+++ b/lib/Maypole/templates/factory/macros
@@ -56,15 +56,20 @@ for some.
 [% MACRO display_line(item) BLOCK;
     FOR col = classmetadata.list_columns;
 	NEXT IF col == "id" OR col == classmetadata.table _ "_id";
+	col_obj = item.find_column(col);
         "<td>";
         IF col == "url" AND item.url;
             '<a href="'; item.url | html ; '"> '; item.url; '</a>';
         ELSIF col == classmetadata.stringify_column;
             maybe_link_view(item);
-        ELSE;
-            accessor = item.accessor_name(col);
+ 		ELSIF col_obj; # its a real column
+            accessor = item.accessor_name_for(col_obj) ||
+			           item.accessor_name(col_obj); # deprecated in cdbi
             maybe_link_view(item.$accessor);
+        ELSE; 
+            item.$col;
         END;
+
         "</td>";
     END;
     '<td class="actions">';
@@ -133,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;
@@ -149,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; %]
 [%#