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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-09-17 10:21:04 +0200 (Fri, 17 Sep 2010)
New Revision: 3710

Modified:
   base/trunk/mpulsweb/controllers/privacy.py
Log:
* mpulsweb/controllers/privacy.py (PrivacyController.decline):
  Issue1066. Do not allow declining EE-statement if case is and
  running and the condition for minimal constistence checks are false.


Modified: base/trunk/mpulsweb/controllers/privacy.py
===================================================================
--- base/trunk/mpulsweb/controllers/privacy.py	2010-09-17 08:17:46 UTC (rev 3709)
+++ base/trunk/mpulsweb/controllers/privacy.py	2010-09-17 08:21:04 UTC (rev 3710)
@@ -102,17 +102,8 @@
         id = self._checkInt(id)
         confirmed = self._checkBool(confirmed)
         case = self._loadCase(id)
-
-        # Check if the case has set the minimum required fields.
-        # Thefore get a list of minimum required fields. This is usually the
-        # relevant date fields plus additionally some fields (e.g type of end
-        # of cm) Further phase will be finished on decline. So check if the
-        # minimum fields in the endphase are present.
-
-        min_fields = g.mpuls_config.get('phases', 'minimal_fields_to_anonymize') 
-        endphase = str(determineAnonymizedCaseEndPhase(case))
         try:
-            case.check_anonymizeability(fields=min_fields, phase=endphase)
+            case.check_anonymizeability()
         except ConsistenceCheckException, e:
             c.dialog_title = PRIVACY_DECLINE_DISALLOWED
             c.dialog_text = h.literal(PRIVACY_DECLINE_DISALLOWED_TEXT % e.value)