ADD: Pagination for ttp list

diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
index d9c6740a313fe696793435357c7dad5340f7ca99..1bb6e4cd26c22ff324cf11e81f0e542a25b90abf 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.java
@@ -35,6 +35,8 @@ public class TTPAdminPage extends Page {
         resp.sendRedirect(PATH);
     }
 
         resp.sendRedirect(PATH);
     }
 

+    private static final int PAGE_LEN = 30;
+

     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         String path = req.getPathInfo();
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         String path = req.getPathInfo();


@@ -47,7 +49,13 @@ public class TTPAdminPage extends Page {
             new TTPAdminForm(req, u).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
             return;
         }
             new TTPAdminForm(req, u).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
             return;
         }

-        final User[] users = TTP_APPLICANT.getMembers(0, 30);
+        int offset = 0;
+        String offsetS = req.getParameter("offset");
+        if (offsetS != null) {
+            offset = Integer.parseInt(offsetS);
+        }
+
+        final User[] users = TTP_APPLICANT.getMembers(offset, PAGE_LEN + 1);

         HashMap<String, Object> vars = new HashMap<>();
         vars.put("users", new IterableDataset() {
 
         HashMap<String, Object> vars = new HashMap<>();
         vars.put("users", new IterableDataset() {
 


@@ -55,7 +63,7 @@ public class TTPAdminPage extends Page {
 
             @Override
             public boolean next(Language l, Map<String, Object> vars) {
 
             @Override
             public boolean next(Language l, Map<String, Object> vars) {

-                if (i >= users.length) {
+                if (i >= Math.min(PAGE_LEN, users.length)) {

                     return false;
                 }
                 vars.put("id", Integer.toString(users[i].getId()));
                     return false;
                 }
                 vars.put("id", Integer.toString(users[i].getId()));


@@ -66,6 +74,9 @@ public class TTPAdminPage extends Page {
                 return true;
             }
         });
                 return true;
             }
         });

+        if (users.length == PAGE_LEN + 1) {
+            vars.put("next", Integer.toString(offset + 30));
+        }

         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }
 
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }
 

diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ
index 1e41bf855a6a02954f0d2baa81745380880b6afc..2e0de030abdd22de3b3c094723d00c7604757098 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ
@@ -3,4 +3,7 @@
 <? foreach($users) { ?>
 <tr><td><?=$name?></td><td><?=$email?></td><td><a href="/admin/ttp/<?=$id?>">Process</a></td></tr>
 <? } ?>
 <? foreach($users) { ?>
 <tr><td><?=$name?></td><td><?=$email?></td><td><a href="/admin/ttp/<?=$id?>">Process</a></td></tr>
 <? } ?>

-</table>
\ No newline at end of file
+</table>
+<? if($next) { ?>
+<a href="?offset=<?=$next?>"><?=_next?></a>
+<? } ?>