[Mpuls-commits] r4988 - in wasko/trunk: . waskoweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-05-20 16:06:05 +0200 (Fri, 20 May 2011)
New Revision: 4988

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/controllers/caselifetime.py
Log:
* waskoweb/controllers/caselifetime.py (COPY_BLACK_LIST): Add
datum_kf_1 (Datum Beginn der Kompetenzfeststellung) and
datum_bfplan (Datum Beginn der Bildungs- und F?\195?\182rderplanung) so
that they will not be copied to the new case created for
"wiederaufnahme". Fixes part of mpuls/issue1673.


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-05-20 13:09:52 UTC (rev 4987)
+++ wasko/trunk/ChangeLog	2011-05-20 14:06:05 UTC (rev 4988)
@@ -1,5 +1,13 @@
 2011-05-20  Bernhard Herzog  <bh at intevation.de>
 
+	* waskoweb/controllers/caselifetime.py (COPY_BLACK_LIST): Add
+	datum_kf_1 (Datum Beginn der Kompetenzfeststellung) and
+	datum_bfplan (Datum Beginn der Bildungs- und Förderplanung) so
+	that they will not be copied to the new case created for
+	"wiederaufnahme". Fixes part of mpuls/issue1673.
+
+2011-05-20  Bernhard Herzog  <bh at intevation.de>
+
 	* waskoweb/controllers/caselifetime.py (REOPENNOTOK_TEXT_CONFIRM):
 	Re-add a space that was lost in the formatting fixes. This space
 	is already present in the earlier update of the translations.

Modified: wasko/trunk/waskoweb/controllers/caselifetime.py
===================================================================
--- wasko/trunk/waskoweb/controllers/caselifetime.py	2011-05-20 13:09:52 UTC (rev 4987)
+++ wasko/trunk/waskoweb/controllers/caselifetime.py	2011-05-20 14:06:05 UTC (rev 4988)
@@ -93,8 +93,14 @@
 the administration for seletion.''')
 ABORT_HEADER_CONFIRM = _(u'Do you want to abort the entry documentation?')
 
-# items not to be copied from old case
-COPY_BLACK_LIST = frozenset(['erstgespraech', 'datum_cm_start'])
+# items not to be copied from old case for "neuaufnahme" and
+# "wiederaufnahme"
+# erstgespraech, datum_cm_start are relevant for both.
+# datum_kf_1, datum_bfplan only have to be treated specially for
+# wiederaufnahme, but they won't be copied at all for neuaufnahme, so
+# including them here should not affect neuaufnahme.
+COPY_BLACK_LIST = frozenset(["erstgespraech", "datum_cm_start",
+                             "datum_kf_1", "datum_bfplan"])
 
 
 def toErrorDicts(e):