Simplify pagination.

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

diff --git a/wradmin/controllers/gasthaus.py b/wradmin/controllers/gasthaus.py
index a769a9b179de348e655a82b8ef7f2fd79614f5c7..65514ef91b5789511ec6e4956459acf750175bcf 100644 (file)
--- a/wradmin/controllers/gasthaus.py
+++ b/wradmin/controllers/gasthaus.py
@@ -1,42 +1,41 @@
 #!/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, redirect, session, url_for
+import paginate
 import sqlalchemy as sa
-import formencode
-import re
 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
-log = logging.getLogger(__name__)
+import wradmin.model as model
+from wradmin.genshi import render_genshi_template, TemplateContext
+
 
-class GasthausController(BaseController):
+class GasthausController:
 
     def list(self):
-        "Lists all inns"
+        """Lists all inns"""
         q = model.meta.Session.query(model.WrInnCache)
         q = q.order_by(model.WrInnCache.page_title)
-        c.paginator = paginate.Page(q, page=int(request.params.get('page', 1)), items_per_page = 25)
-        return render('gasthaus_list.html')
-    
-    
+        c = TemplateContext()
+        c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)),
+                                    url_maker=lambda page: url_for('gasthaus_list', page=page),
+                                    items_per_page=25)
+        return render_genshi_template('gasthaus_list.html', c=c)
+
     def view(self, id):
-        "Displays an inn"
+        """Displays an inn"""
         q = model.meta.Session.query(model.WrInnCache)
+        c = TemplateContext()
         c.inn =  q.get(id)
-        if c.inn is None: abort(404)
-        return render('gasthaus_view.html')
-    
-    
+        if c.inn is None:
+            abort(404)
+        return render_genshi_template('gasthaus_view.html', c=c)
+
     def update(self):
-        "Updates the wrinncache table from the wiki"
+        """Updates the wrinncache table from the wiki"""
         c = model.meta.Session.connection()
         try:
             wrpylib.wrmwcache.update_wrinncache(c)
@@ -49,7 +48,5 @@ class GasthausController(BaseController):
             msg = msg.replace('\n', '; ')
             if len(e.args) == 3: session['flash'] = "Fehler bei Gasthaus '{0}': {1}".format(title, msg)
             else: session['flash'] = str(e)
-        session.save()
         # Redirect to result page
-        return redirect(url(controller='gasthaus', action='list'))
-
+        return redirect(url_for('gasthaus_list'))