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

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

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index 66107f24f21d5e5c40706f53d11d38963b9efe1f..0b166fe8c272901651143ddc1ace0ff3c4a9c480 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.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 sqlalchemy as sa
 
@@ -8,7 +8,6 @@ import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
 import wradmin.model as model
-from wradmin.genshi import render_genshi_template, TemplateContext
 
 
 class RodelbahnController:
@@ -17,25 +16,23 @@ class RodelbahnController:
         """Lists all sled runs"""
         q = model.meta.Session.query(model.WrSledrunCache)
         q = q.order_by(model.WrSledrunCache.page_title)
-        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)
+        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_template('rodelbahn_list.html', paginator=paginator)
 
     def view(self, id):
         """Displays a sled run"""
         q = model.meta.Session.query(model.WrSledrunCache)
-        c = TemplateContext()
-        c.sledding = q.get(id)
-        if c.sledding is None:
+        sledding = q.get(id)
+        if 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.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)
+        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_template('rodelbahn_view.html', sledding=sledding, paginator=paginator)
 
     def update(self):
         """Updates the wrsledruncache table from the wiki"""
@@ -46,7 +43,7 @@ class RodelbahnController:
             flash('Die Rodelbahnliste 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:
@@ -57,7 +54,7 @@ class RodelbahnController:
         return redirect(url_for('rodelbahn_list'))
 
     def update_regioncache(self):
-        "Updates the wrregioncache table from the wiki"
+        """Updates the wrregioncache table from the wiki"""
         c = model.meta.Session.connection()
         try:
             wrpylib.wrmwcache.update_wrregioncache(c)