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

diff --git a/wradmin/controllers/rodelbahn.py b/wradmin/controllers/rodelbahn.py
index 00be2c909e9e9c44e32e5669d43c9956f573337d..71d5bc2f449c43234accf24f52021f2962801cd6 100644 (file)
--- a/wradmin/controllers/rodelbahn.py
+++ b/wradmin/controllers/rodelbahn.py
@@ -14,6 +14,7 @@ import re
 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 
 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' # --"--
 
 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:
             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
             else: session['flash'] = unicode(e)
         session.save()
         # Redirect to result page