Rename sledding in sledrun.

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

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index f6bd26d31acdc342f3bb7ff8c4890e2bfe0e5f28..2089cdd2f925635402f42bc7cfebbba4bc8a1c99 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python3.4
 from flask import request, abort, redirect, url_for, flash, render_template
 import paginate
 import sqlalchemy as sa
@@ -7,15 +6,16 @@ import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
-import wradmin.model as model
+from wradmin.app import db
+from wradmin.model import WrSledrunCache, WrReport
 
 
 class RodelbahnController:
 
     def list(self):
         """Lists all sled runs"""
-        q = model.meta.Session.query(model.WrSledrunCache)
-        q = q.order_by(model.WrSledrunCache.page_title)
+        q = db.session.query(WrSledrunCache)
+        q = q.order_by(WrSledrunCache.page_title)
         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)
@@ -23,23 +23,23 @@ class RodelbahnController:
 
     def view(self, id):
         """Displays a sled run"""
-        q = model.meta.Session.query(model.WrSledrunCache)
-        sledding = q.get(id)
-        if sledding is None:
+        q = db.session.query(WrSledrunCache)
+        sledrun = q.get(id)
+        if sledrun 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))
+        q = db.session.query(WrReport)
+        q = q.filter_by(page_id=id).order_by(sa.sql.expression.desc(WrReport.id))
         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)
+        return render_template('rodelbahn_view.html', sledding=sledrun, paginator=paginator)
 
     def update(self):
         """Updates the wrsledruncache table from the wiki"""
-        c = model.meta.Session.connection()
+        c = db.session.connection()
         try:
             wrpylib.wrmwcache.update_wrsledruncache(c)
-            model.meta.Session.commit()
+            db.session.commit()
             flash('Die Rodelbahnliste wurde erfolgreich aktualisiert.', 'info')
         except wrpylib.wrmwcache.UpdateCacheError as e:
             title = str(e.args[1])
@@ -55,10 +55,10 @@ class RodelbahnController:
 
     def update_regioncache(self):
         """Updates the wrregioncache table from the wiki"""
-        c = model.meta.Session.connection()
+        c = db.session.connection()
         try:
             wrpylib.wrmwcache.update_wrregioncache(c)
-            model.meta.Session.commit()
+            db.session.commit()
             flash('Die Rodelbahneinträge in den Regionslisten wurden erfolgreich aktualisiert.', 'info')
         except wrpylib.wrmwcache.UpdateCacheError as e:
             flash(str(e), 'error')
@@ -67,10 +67,10 @@ class RodelbahnController:
 
     def update_mapcache(self):
         """Updates the wrmappointcache and wrmappathcache tables from the wiki."""
-        c = model.meta.Session.connection()
+        c = db.session.connection()
         try:
             wrpylib.wrmwcache.update_wrmapcache(c)
-            model.meta.Session.commit()
+            db.session.commit()
             flash('Die Landkarteninformationen aus dem Wiki wurden erfolgreich aktualisiesrt.', 'info')
         except wrpylib.wrmwcache.UpdateCacheError as e:
             flash(str(e), 'error')