X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=templates%2Ffactory%2Flist;h=03a712b661954af4c119aa109625a89b5927ffc9;hb=6438c73c6e11a516bfb670397bfc57048ac94c44;hp=fab90b8627ea39d508382f0f42f28e7438dc91fb;hpb=fdb1043b4260053234d48abc51d3838a2f74d957;p=maypole.git

diff --git a/templates/factory/list b/templates/factory/list
index fab90b8..03a712b 100644
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -1,6 +1,11 @@
 [% PROCESS macros %]
 [% INCLUDE header %]
 [% INCLUDE title %]
+[% IF search %]
+    <div id="title">Search results</div>
+[% ELSE %]
+    <div id="title">Listing of all [% classmetadata.plural %]</div>
+[% END %]
 [% INCLUDE navbar %]
 <div class="list">
     <table id="matrix" width="100%" >
@@ -9,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";