[Mpuls-commits] r5398 - base/trunk/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-09-29 15:21:12 +0200 (Thu, 29 Sep 2011)
New Revision: 5398

Modified:
   base/trunk/mpulsweb/controllers/meta.py
Log:
Handle meta exceptions with the _handle_meta_exception function.


Modified: base/trunk/mpulsweb/controllers/meta.py
===================================================================
--- base/trunk/mpulsweb/controllers/meta.py	2011-09-27 18:26:10 UTC (rev 5397)
+++ base/trunk/mpulsweb/controllers/meta.py	2011-09-29 13:21:12 UTC (rev 5398)
@@ -229,6 +229,7 @@
         form_errors = {}
         validator = MetaSearchForm()
         c.case = self._loadCase(session.get('case').id)
+        meta = c.case.getMeta()
         try:
             form_result = validator.to_python(request.params)
             birthname = form_result.get('birthname')
@@ -271,10 +272,9 @@
             form_errors = exc.error_dict or {}
             c.show_create = False
         except MetaException, exc:
-            log.exception('Exception while trying to search for case')
-            return error(header=_("Error while trying to search case"),
-                         text=exc.message,
-                         url_ok=url_for(controller="/meta", action="search"))
+            return self._handle_meta_exception(meta, exc,
+                                               "search",
+                                               _("Error while trying to search case"))
 
         form = render('meta/search.mako')
         return formencode.htmlfill.render(form, defaults=form_defaults,
@@ -423,9 +423,9 @@
         if isinstance(exc, MetaUnauthorized):
             log.error("Meta server refused request with 401 Unauthorized")
             text = _("The meta server did not accept the request"
-                     " because of missing or incorrect username or"
-                     " password. Please check whether the"
-                     " meta-server is configured correctly.")
+                     " because of either disabled user or missing or"
+                     " incorrect username or password. Please check"
+                     " whether the meta-server is configured correctly.")
 
         elif isinstance(exc, UnknownMetaCase):
             log.error("Meta case for %s seems to have been deleted."