From a7429cacb21934c09f3f3f2c908acea07b056c03 Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 23 Mar 2014 13:44:32 +0000 Subject: [PATCH] When updating sledruns, multiple errors in a Rodelbahnbox are now separated by ';'. git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@1945 7aebc617-e5e2-0310-91dc-80fb5f6d2477 --- wradmin/controllers/rodelbahn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py index 00be2c9..71d5bc2 100644 --- a/wradmin/controllers/rodelbahn.py +++ b/wradmin/controllers/rodelbahn.py @@ -14,6 +14,7 @@ import re import wrpylib.wrmwmarkup import wrpylib.wrmwcache +import wrpylib.mwapi 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' # --"-- @@ -54,7 +55,11 @@ class RodelbahnController(BaseController): model.meta.Session.commit() session['flash'] = u'Die Rodelbahnliste wurde erfolgreich aktualisiert.' except wrpylib.wrmwcache.UpdateCacheError as e: - if len(e.args) == 3: session['flash'] = u"Fehler bei Rodelbahn '{0}': {1}".format(e.args[1], e.args[2]) + title = unicode(e.args[1]) + title = wrpylib.mwapi.to_title(title) + msg = unicode(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() # Redirect to result page -- 2.39.5