[Mpuls-commits] r1474 - in wasko/branches/2.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-10 17:28:31 +0100 (Wed, 10 Feb 2010)
New Revision: 1474

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/case.py
Log:
* waskaweb/controllers/case.py (checkPrivacyStatement.validate):
Remove try/except with a bare except that shows /tests/trace.mako.
Rely on the default error handling instead.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-10 16:24:06 UTC (rev 1473)
+++ wasko/branches/2.0/ChangeLog	2010-02-10 16:28:31 UTC (rev 1474)
@@ -1,5 +1,11 @@
 2010-02-10  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/case.py (checkPrivacyStatement.validate):
+	Remove try/except with a bare except that shows /tests/trace.mako.
+	Rely on the default error handling instead.
+
+2010-02-10  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/case.py (Case.get_preset_fields): Use the
 	formedname in the list of preset fields, not the alias name,
 	otherwise the presets won't work in

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-02-10 16:24:06 UTC (rev 1473)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-02-10 16:28:31 UTC (rev 1474)
@@ -174,12 +174,9 @@
             c.targeturl = h.url_for(controller="/case", action=context,
                                     id=case_id, confirmed=1)
 
-        try:
-            factory = CaseFactory()
-            case = factory.loadById(case_id)
-        except:
-            return render('/tests/trace.mako')
-            self.showError()
+        factory = CaseFactory()
+        case = factory.loadById(case_id)
+
         statement = case.getPrivacyStatement()
         # Check if there is a "Einverstaendniserklaerung" None if it is
         # not either signed or declined