Whitespace cosmetics.

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

diff --git a/wradmin/controllers/gasthaus.py b/wradmin/controllers/gasthaus.py
index a20566e497c22802fe5ef20e481665f4e996d975..95faba71240d183e55bccbffd63633d3fd206961 100644 (file)
--- a/wradmin/controllers/gasthaus.py
+++ b/wradmin/controllers/gasthaus.py
@@ -1,16 +1,12 @@
 #!/usr/bin/python3.4
 #!/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, redirect, session, url_for
+from flask import request, abort, redirect, url_for, flash, render_template

 import paginate
 import paginate

-import sqlalchemy as sa

 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
 import wradmin.model as model
 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
 import wradmin.model as model

-from wradmin.genshi import render_genshi_template, TemplateContext

 
 
 class GasthausController:
 
 
 class GasthausController:


@@ -19,18 +15,18 @@ class GasthausController:
         """Lists all inns"""
         q = model.meta.Session.query(model.WrInnCache)
         q = q.order_by(model.WrInnCache.page_title)
         """Lists all inns"""
         q = model.meta.Session.query(model.WrInnCache)
         q = q.order_by(model.WrInnCache.page_title)

-        c = TemplateContext()
-        c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)), items_per_page = 25)
-        return render_genshi_template('gasthaus_list.html', c=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_template('gasthaus_list.html', paginator=paginator)

 
     def view(self, id):
         """Displays an inn"""
         q = model.meta.Session.query(model.WrInnCache)
 
     def view(self, id):
         """Displays an inn"""
         q = model.meta.Session.query(model.WrInnCache)

-        c = TemplateContext()
-        c.inn =  q.get(id)
-        if c.inn is None:
+        inn = q.get(id)
+        if inn is None:

             abort(404)
             abort(404)

-        return render_genshi_template('gasthaus_view.html', c=c)
+        return render_template('gasthaus_view.html', inn=inn)

 
     def update(self):
         """Updates the wrinncache table from the wiki"""
 
     def update(self):
         """Updates the wrinncache table from the wiki"""


@@ -38,13 +34,14 @@ class GasthausController:
         try:
             wrpylib.wrmwcache.update_wrinncache(c)
             model.meta.Session.commit()
         try:
             wrpylib.wrmwcache.update_wrinncache(c)
             model.meta.Session.commit()

-            session['flash'] = 'Die Gasthausliste wurde erfolgreich aktualisiert.'
+            flash('Die Gasthausliste wurde erfolgreich aktualisiert.', 'info')

         except wrpylib.wrmwcache.UpdateCacheError as e:
             title = str(e.args[1])
         except wrpylib.wrmwcache.UpdateCacheError as e:
             title = str(e.args[1])

-            title = wrpylib.mwmarkup.to_title(title)
+            title = wrpylib.mwmarkup.dbkey_to_title(title)

             msg = str(e.args[2])
             msg = msg.replace('\n', '; ')
             msg = str(e.args[2])
             msg = msg.replace('\n', '; ')

-            if len(e.args) == 3: session['flash'] = "Fehler bei Gasthaus '{0}': {1}".format(title, msg)
-            else: session['flash'] = str(e)
+            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_for('gasthaus_list'))
         # Redirect to result page
         return redirect(url_for('gasthaus_list'))