[Mpuls-commits] r599 - waska/trunk/waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-09-08 15:57:19 +0200 (Tue, 08 Sep 2009)
New Revision: 599

Modified:
   waska/trunk/waskaweb/controllers/case.py
Log:
Added check if phase is finished on anonymization


Modified: waska/trunk/waskaweb/controllers/case.py
===================================================================
--- waska/trunk/waskaweb/controllers/case.py	2009-09-08 13:45:35 UTC (rev 598)
+++ waska/trunk/waskaweb/controllers/case.py	2009-09-08 13:57:19 UTC (rev 599)
@@ -73,7 +73,7 @@
 from waskaweb.model.phases           import Phase
 from waskaweb.model.phase_transition import symbol_phase, phase_neighbors, \
                                             PHASE_DESCRIPTIONS, phase_start, \
-                                            CLEAR_START, CLEAR_ENDE
+                                            CLEAR_START, CLEAR_ENDE, CM_ENDE, NB_ENDE
 
 from waskaweb.lib.db        import db
 from waskaweb.lib.xmlimport import importFromXML
@@ -1323,7 +1323,7 @@
         # Check if the case is in a consistent state (all required fields
         # are filled)
         case = self._loadCase(id)
-        if (not case.getState().phasesAreConsistent() or not case.getState().phasesAreCompleted()) and case.isYoungerThan(INCONSISTENCY_CHECK_AFTER):
+        if (not case.getState().phasesAreConsistent() or not case.getState().phasesAreCompleted() or not case.getState().getPhase() in (CM_ENDE, NB_ENDE)) and case.isYoungerThan(INCONSISTENCY_CHECK_AFTER):
             c.failed_for  = MARKANONYMIZE_INCOMPLETE_PHASE_FAILED 
             if case.getState().getPhase() in (CLEAR_START, CLEAR_ENDE):
                 c.failed_text = \