Simplify pagination.

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

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index 7aea8f2e8224b24dec01c70103b0f5899a11a534..ab67570ecfd1bf797607d8d7ad50d5839fc369ba 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -1,51 +1,44 @@
 #!/usr/bin/python3.4
-import logging
-
-from pylons import request, response, session, url, tmpl_context as c
-from pylons.controllers.util import abort, redirect
-import webhelpers.paginate as paginate
-
-from wradmin.lib.base import BaseController, render
-import wradmin.model as model
+#from pylons import request, response, session, url, tmpl_context as c
+#from pylons.controllers.util import abort, redirect
+from flask import request, abort, url_for
+import paginate
 import sqlalchemy as sa
-import formencode
-import re
 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
-from weberror import collector        # Prevent a bug of weberror # See https://bitbucket.org/bbangert/weberror/issue/3/nameerror-global-name-fallback_encoding-is-not
-collector.FALLBACK_ENCODING = 'utf-8' # --"--
-
-log = logging.getLogger(__name__)
-
-
-class RodelbahnController(BaseController):
+import wradmin.model as model
+from wradmin.genshi import render_genshi_template, TemplateContext
 
-    def index(self):
-        return render('index.html')
 
+class RodelbahnController:
 
     def list(self):
-        "Lists all sled runs"
+        """Lists all sled runs"""
         q = model.meta.Session.query(model.WrSledrunCache)
         q = q.order_by(model.WrSledrunCache.page_title)
-        c.paginator = paginate.Page(q, page=int(request.params.get('page', 1)), items_per_page = 25)
-        return render('rodelbahn_list.html')
-    
-    
+        c = TemplateContext()
+        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):
-        "Displays a sled run"
+        """Displays a sled run"""
         q = model.meta.Session.query(model.WrSledrunCache)
-        c.sledding =  q.get(id)
-        if c.sledding is None: abort(404)
+        c = TemplateContext()
+        c.sledding = q.get(id)
+        if c.sledding is None:
+            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, page=int(request.params.get('page', 1)), items_per_page = 25)
-        return render('rodelbahn_view.html')
-    
-    
+        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):
         "Updates the wrsledruncache table from the wiki"
         c = model.meta.Session.connection()