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

[maypole.git] / templates / factory / pager

diff --git a/templates/factory/pager b/templates/factory/pager
index bb78138691e6377de22150bc01273e2f31ce19b3..78c89fd6aa93da92fef0f4d59738b37f52588db5 100644 (file)
--- a/templates/factory/pager
+++ b/templates/factory/pager
@@ -12,6 +12,10 @@ IF pager AND pager.first_page != pager.last_page;
 %]
 <p class="pager">Pages: 
 [%
+    UNLESS pager_action;
+       SET pager_action = request.action;
+    END;
+   
     SET begin_page = pager.current_page - 10;
     IF begin_page < 1;
         SET begin_page = pager.first_page;
@@ -26,18 +30,17 @@ IF pager AND pager.first_page != pager.last_page;
           ELSE;
             SET label = num;
             SET args = "?page=" _ num;
-           SET args = args _ "&order=" _ request.query.order
-             IF request.query.order;
+           SET args = args _ "&order=" _ request.params.order
+             IF request.params.order;
            SET args = args _ "&amp;o2=desc"
-             IF request.query.o2 == "desc";
-            SET action = "list";
+             IF request.params.o2 == "desc";
             FOR col = classmetadata.columns.list;
-              IF request.query.$col;
-                SET args = args _ "&" _ col _ "=" _ request.query.$col;
+              IF request.params.$col;
+                SET args = args _ "&" _ col _ "=" _ request.params.$col;
                 SET action = "search";
               END;
             END;
-            link(classmetadata.table, action, args, label);
+            link(classmetadata.table, pager_action, args, label);
           END;
      END;
 %]