[Mpuls-commits] r3612 - in base/trunk: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-09-13 17:51:55 +0200 (Mon, 13 Sep 2010)
New Revision: 3612

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/case_bundle.py
Log:
* mpulsweb/controllers/case_bundle.py
(CaseBundleController.bundleAction): Allow cases that are marked
for anonymization or already anonymized to be exported.  Fixes
mpuls/issue865.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-09-13 15:35:59 UTC (rev 3611)
+++ base/trunk/ChangeLog	2010-09-13 15:51:55 UTC (rev 3612)
@@ -1,6 +1,13 @@
 2010-09-13  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/controllers/case_bundle.py
+	(CaseBundleController.bundleAction): Allow cases that are marked
+	for anonymization or already anonymized to be exported.  Fixes
+	mpuls/issue865.
+
+2010-09-13  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/controllers/case_bundle.py
 	(CaseBundleController.bundleAction): There's no need to get the
 	user object from the session for an export action.
 

Modified: base/trunk/mpulsweb/controllers/case_bundle.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_bundle.py	2010-09-13 15:35:59 UTC (rev 3611)
+++ base/trunk/mpulsweb/controllers/case_bundle.py	2010-09-13 15:51:55 UTC (rev 3612)
@@ -159,7 +159,11 @@
                 return render('/casebundle/editor.mako')
 
             if action.startswith("export"):
-                case_bundle = self._filterBundle(case_bundle, (1, 2))
+                # allow export of cases that are active (1), marked for
+                # anonymization (4) or anonymized (5).  For historical
+                # reasons, there's also the old now unused state 2 in
+                # the filter tuple.
+                case_bundle = self._filterBundle(case_bundle, (1, 2, 4, 5))
                 if case_bundle.isEmpty():
                     return self._empty_caselist()
                 session['casebundle'] = case_bundle