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 d9906b6cc9a356fa59cb4d7faddd7571bd751cdf..0b166fe8c272901651143ddc1ace0ff3c4a9c480 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -1,81 +1,66 @@
-#!/usr/bin/python2.6
-# -*- coding: iso-8859-15 -*-
-import logging
-
-from pylons import request, response, session, url, tmpl_context as c
-from pylons.controllers.util import abort, redirect
-import webhelpers.paginate as paginate
-
-from wradmin.lib.base import BaseController, render
-import wradmin.model as model
+#!/usr/bin/python3.4
+from flask import request, abort, redirect, url_for, flash, render_template
+import paginate
 import sqlalchemy as sa
-import formencode
-import re
 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
-from weberror import collector        # Prevent a bug of weberror # See https://bitbucket.org/bbangert/weberror/issue/3/nameerror-global-name-fallback_encoding-is-not
-collector.FALLBACK_ENCODING = 'utf-8' # --"--
-
-log = logging.getLogger(__name__)
-
-
-class RodelbahnController(BaseController):
+import wradmin.model as model
 
-    def index(self):
-        return render('index.html')
 
+class RodelbahnController:
 
     def list(self):
-        "Lists all sled runs"
+        """Lists all sled runs"""
         q = model.meta.Session.query(model.WrSledrunCache)
         q = q.order_by(model.WrSledrunCache.page_title)
-        c.paginator = paginate.Page(q, page=int(request.params.get('page', 1)), items_per_page = 25)
-        return render('rodelbahn_list.html')
-    
-    
+        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"
+        """Displays a sled run"""
         q = model.meta.Session.query(model.WrSledrunCache)
-        c.sledding =  q.get(id)
-        if c.sledding is None: abort(404)
+        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, page=int(request.params.get('page', 1)), items_per_page = 25)
-        return render('rodelbahn_view.html')
-    
-    
+        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"
+        """Updates the wrsledruncache table from the wiki"""
         c = model.meta.Session.connection()
         try:
             wrpylib.wrmwcache.update_wrsledruncache(c)
             model.meta.Session.commit()
-            session['flash'] = u'Die Rodelbahnliste wurde erfolgreich aktualisiert.'
+            flash('Die Rodelbahnliste wurde erfolgreich aktualisiert.', 'info')
         except wrpylib.wrmwcache.UpdateCacheError as e:
-            title = unicode(e.args[1])
-            title = wrpylib.mwmarkup.to_title(title)
-            msg = unicode(e.args[2])
+            title = str(e.args[1])
+            title = wrpylib.mwmarkup.dbkey_to_title(title)
+            msg = str(e.args[2])
             msg = msg.replace('\n', '; ')
-            if len(e.args) == 3: session['flash'] = u"Fehler bei Rodelbahn '{0}': {1}".format(title, msg)
-            else: session['flash'] = unicode(e)
-        session.save()
+            if len(e.args) == 3:
+                flash("Fehler bei Rodelbahn '{0}': {1}".format(title, msg), 'error')
+            else:
+                flash(str(e), 'error')
         # Redirect to result page
-        return redirect(url(controller='rodelbahn', action='list'))
-
+        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)
             model.meta.Session.commit()
-            session['flash'] = u'Die Rodelbahneinträge in den Regionslisten wurden erfolgreich aktualisiert.'
+            flash('Die Rodelbahneinträge in den Regionslisten wurden erfolgreich aktualisiert.', 'info')
         except wrpylib.wrmwcache.UpdateCacheError as e:
-            session['flash'] = unicode(e)
-        session.save()
+            flash(str(e), 'error')
         # Redirect to result page
-        return redirect(url(controller='rodelbahn', action='list'))
-
+        return redirect(url_for('rodelbahn_list'))