X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=templates%2Ffactory%2Fpager;h=78c89fd6aa93da92fef0f4d59738b37f52588db5;hb=12d8a77a713d5ed4f08414e5f34e96d45f60e2d3;hp=558da84d680fadb80e0663d94465e2fa069f83d0;hpb=9a7c10849815112cab035e38d5937adb08dcd635;p=maypole.git

diff --git a/templates/factory/pager b/templates/factory/pager
index 558da84..78c89fd 100644
--- 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,14 +30,17 @@ IF pager AND pager.first_page != pager.last_page;
           ELSE;
             SET label = num;
             SET args = "?page=" _ num;
-            SET action = "list";
+	    SET args = args _ "&order=" _ request.params.order
+	      IF request.params.order;
+	    SET args = args _ "&amp;o2=desc"
+	      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;
 %]