Simplify pagination.

[philipp/winterrodeln/wradmin.git] / wradmin / controllers / rodelbahn.py

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index 547f004be14380ea9cb98db36eeaf86ad2c2c3b3..ab67570ecfd1bf797607d8d7ad50d5839fc369ba 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3.4
 #from pylons import request, response, session, url, tmpl_context as c
 #from pylons.controllers.util import abort, redirect
-from flask import request, abort
+from flask import request, abort, url_for
 import paginate
 import sqlalchemy as sa
 
@@ -20,7 +20,9 @@ class RodelbahnController:
         q = model.meta.Session.query(model.WrSledrunCache)
         q = q.order_by(model.WrSledrunCache.page_title)
         c = TemplateContext()
-        c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)), items_per_page = 25)
+        c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)),
+                                    url_maker=lambda page: url_for('rodelbahn_list', page=page),
+                                    items_per_page=25)
         return render_genshi_template('rodelbahn_list.html', c=c)
 
     def view(self, id):
@@ -32,7 +34,9 @@ class RodelbahnController:
             abort(404)
         q = model.meta.Session.query(model.WrReport)
         q = q.filter_by(page_id=id).order_by(sa.sql.expression.desc(model.WrReport.id))
-        c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)), items_per_page = 25)
+        c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)),
+                                    url_maker=lambda page: url_for('rodelbahn_view', id=id, page=page),
+                                    items_per_page=25)
         return render_genshi_template('rodelbahn_view.html', c=c)
 
     def update(self):