Fixed: Avoid calling function to_title (that was renamed to dbkey_to_title).

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

diff --git a/wradmin/controllers/gasthaus.py b/wradmin/controllers/gasthaus.py
index b1e9d2586ae8b7f547650a155c636571a86e3f9e..95faba71240d183e55bccbffd63633d3fd206961 100644 (file)
--- a/wradmin/controllers/gasthaus.py
+++ b/wradmin/controllers/gasthaus.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3.4
-from flask import request, abort, redirect, url_for, flash
+from flask import request, abort, redirect, url_for, flash, render_template
 import paginate
 
 import wrpylib.wrmwmarkup
@@ -7,7 +7,6 @@ import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
 import wradmin.model as model
-from wradmin.genshi import render_genshi_template, TemplateContext
 
 
 class GasthausController:
@@ -16,20 +15,18 @@ class GasthausController:
         """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)),
-                                    url_maker=lambda page: url_for('gasthaus_list', page=page),
-                                    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)
-        c = TemplateContext()
-        c.inn =  q.get(id)
-        if c.inn is None:
+        inn = q.get(id)
+        if inn is None:
             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"""
@@ -40,7 +37,7 @@ class GasthausController:
             flash('Die Gasthausliste wurde erfolgreich aktualisiert.', 'info')
         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', '; ')
             if len(e.args) == 3: