Whitespace cosmetics.

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

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index c9c5b6f73ed0c1efd939b36f60d86f548fca006f..f6bd26d31acdc342f3bb7ff8c4890e2bfe0e5f28 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -8,7 +8,6 @@ import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
 import wradmin.model as model
 import wrpylib.mwmarkup
 
 import wradmin.model as model

-from wradmin.genshi import render_genshi_template, TemplateContext

 
 
 class RodelbahnController:
 
 
 class RodelbahnController:


@@ -25,16 +24,15 @@ class RodelbahnController:
     def view(self, id):
         """Displays a sled run"""
         q = model.meta.Session.query(model.WrSledrunCache)
     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))
             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"""
 
     def update(self):
         """Updates the wrsledruncache table from the wiki"""


@@ -45,7 +43,7 @@ class RodelbahnController:
             flash('Die Rodelbahnliste wurde erfolgreich aktualisiert.', 'info')
         except wrpylib.wrmwcache.UpdateCacheError as e:
             title = str(e.args[1])
             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:
             msg = str(e.args[2])
             msg = msg.replace('\n', '; ')
             if len(e.args) == 3:


@@ -66,3 +64,15 @@ class RodelbahnController:
             flash(str(e), 'error')
         # Redirect to result page
         return redirect(url_for('rodelbahn_list'))
             flash(str(e), 'error')
         # Redirect to result page
         return redirect(url_for('rodelbahn_list'))

+
+    def update_mapcache(self):
+        """Updates the wrmappointcache and wrmappathcache tables from the wiki."""
+        c = model.meta.Session.connection()
+        try:
+            wrpylib.wrmwcache.update_wrmapcache(c)
+            model.meta.Session.commit()
+            flash('Die Landkarteninformationen aus dem Wiki wurden erfolgreich aktualisiesrt.', 'info')
+        except wrpylib.wrmwcache.UpdateCacheError as e:
+            flash(str(e), 'error')
+        # Redirect to result page
+        return redirect(url_for('rodelbahn_list'))