Maypole::Application supports Maypole::HTTPD (which needs a patch).

[maypole.git] / templates / factory / list

diff --git a/templates/factory/list b/templates/factory/list
index ac3635fd27c690475b26fdeaf45c624534d4ef27..dbbedafb786171b659479b92e2987dd270882773 100644 (file)
--- a/templates/factory/list
+++ b/templates/factory/list
@@ -8,33 +8,38 @@
 [% END %]
 [% INCLUDE navbar %]
 <div class="list">
-    <table id="matrix" width="100%" >
+    <table id="matrix">
         <tr>
             [% FOR col = classmetadata.list_columns.list;
                 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" 
-                IF col == request.query.order and request.query.o2 != "desc";
+                SET additional = additional _ "&o2=desc" 
+                IF col == request.params.order and request.params.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.params.$name;
                     SET action = "search";
                   END;
                 END;
-                link(classmetadata.table, action, additional,
+               IF model_obj.find_column(col);
+                  link(classmetadata.table, action, additional,
                     classmetadata.colnames.$col);
-                IF col == request.query.order;
-                    IF request.query.o2 != "desc";
+                  IF col == request.params.order;
+                    IF request.params.o2 != "desc";
                         "&darr;";
                     ELSE;
                         "&uarr;";
                     END;
-                END;
+                  END;
+               ELSE;
+                 classmetadata.colnames.$col || col FILTER ucfirst;
+               END;
                 "</th>";
             END %]
            <th id="actionth">Actions</th>