final fix

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@255 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/templates/factory/list b/templates/factory/list
index 5e8a760e291fcf850d0efac3f4a47e1e824182da..03a712b661954af4c119aa109625a89b5927ffc9 100644 (file)
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -13,21 +13,22 @@
             [% FOR col = classmetadata.list_columns.list;
                 NEXT IF col == "id";
                 "<th>"; 
-                SET title = classmetadata.colnames.$col;
                 SET additional = "?order=" _ col;
-                SET additional = additional _ "&amp;page=" _ pager.current_page
+                SET additional = additional _ "&page=" _ pager.current_page
                     IF pager;
-                SET additional = additional _ "&amp;o2=desc" 
+                SET additional = additional _ "&o2=desc" 
                 IF col == request.query.order and request.query.o2 != "desc";
                 SET action = "list";
-                FOR col = classmetadata.columns.list;
-                  IF request.query.$col;
+                FOR name = classmetadata.columns.list;
+                  IF request.query.$name;
                     SET additional =
-                        additional  _ "&" _ col _ "=" _ request.query.$col;
+                        additional  _ "&" _ name _ "=" _
+                        request.query.$name;
                     SET action = "search";
                   END;
                 END;
-                link(classmetadata.table, action, additional, title);
+                link(classmetadata.table, action, additional,
+                    classmetadata.colnames.$col);
                 IF col == request.query.order;
                     IF request.query.o2 != "desc";
                         "&darr;";