gasthaus_list.html now uses jinja2.

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

diff --git a/wradmin/controllers/gasthaus.py b/wradmin/controllers/gasthaus.py
index 378e5b9283b728b7e8d7be17481bd56704909e7c..7e25f68a492b352b8b65db5189e3ee62fb191a33 100644 (file)
--- a/wradmin/controllers/gasthaus.py
+++ b/wradmin/controllers/gasthaus.py
@@ -1,51 +1,49 @@
-#!/usr/bin/python2.6
-# -*- coding: iso-8859-15 -*-
-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
-import sqlalchemy as sa
-import formencode
-import re
+#!/usr/bin/python3.4
+from flask import request, abort, redirect, url_for, flash, render_template
+import paginate
 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
+import wrpylib.mwmarkup
+
+import wradmin.model as model
+from wradmin.genshi import render_genshi_template, TemplateContext
 
-log = logging.getLogger(__name__)
 
-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')
-    
-    
+        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_template('gasthaus_list.html', paginator=paginator)
+
     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)
             model.meta.Session.commit()
-            session['flash'] = u'Die Gasthausliste wurde erfolgreich aktualisiert.'
+            flash('Die Gasthausliste wurde erfolgreich aktualisiert.', 'info')
         except wrpylib.wrmwcache.UpdateCacheError as e:
-            if len(e.args) == 3: session['flash'] = u"Fehler bei Gasthaus '{0}': {1}".format(e.args[1], e.args[2])
-            else: session['flash'] = unicode(e)
-        session.save()
+            title = str(e.args[1])
+            title = wrpylib.mwmarkup.to_title(title)
+            msg = str(e.args[2])
+            msg = msg.replace('\n', '; ')
+            if len(e.args) == 3:
+                flash("Fehler bei Gasthaus '{0}': {1}".format(title, msg), 'error')
+            else: flash(str(e), 'error')
         # Redirect to result page
-        return redirect(url(controller='gasthaus', action='list'))
-
+        return redirect(url_for('gasthaus_list'))