final fix

[maypole.git] / templates / factory / list

diff --git a/templates/factory/list b/templates/factory/list
index b8f4fb8774925bfd5f24268a81ff4bf3a24bb1f2..03a712b661954af4c119aa109625a89b5927ffc9 100644 (file)
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -14,11 +14,20 @@
                 NEXT IF col == "id";
                 "<th>"; 
                 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";
-                link(classmetadata.table, "list", additional,
+                SET action = "list";
+                FOR name = classmetadata.columns.list;
+                  IF request.query.$name;
+                    SET additional =
+                        additional  _ "&" _ name _ "=" _
+                        request.query.$name;
+                    SET action = "search";
+                  END;
+                END;
+                link(classmetadata.table, action, additional,
                     classmetadata.colnames.$col);
                 IF col == request.query.order;
                     IF request.query.o2 != "desc";