[Mpuls-commits] r3658 - base/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-09-15 19:48:40 +0200 (Wed, 15 Sep 2010)
New Revision: 3658

Modified:
   base/trunk/ChangeLog
Log:
Updated ChangeLog


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-09-15 17:47:55 UTC (rev 3657)
+++ base/trunk/ChangeLog	2010-09-15 17:48:40 UTC (rev 3658)
@@ -1,3 +1,33 @@
+2010-09-15  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	Issue1123:
+
+	* mpulsweb/templates/logbook/show.mako,
+	  mpulsweb/templates/logbook/overview.mako: Only show links
+	  to edit, delete and create new appointments for editable cases.
+
+	* mpulsweb/model/appointment.py, 
+	  mpulsweb/templates/casemanagement/main.mako, 
+	  mpulsweb/templates/casemanagement/appointmentlist.mako,
+	  mpulsweb/templates/casemanagement/showAppointment.mako,
+	  mpulsweb/templates/casemanagement/reminderlist.mako,
+	  mpulsweb/templates/casemanagement/appointments.mako: Only show
+	  editable appointments and reminders on blackboard. Only show links
+	  to edit, delete and create new appointments for editable cases.
+
+	* mpulsweb/templates/documents/case_overview.mako: Only show delete
+	  and create new document links if the case is in an editable state.
+
+	* mpulsweb/templates/casemanagement/organisation.mako: Only allow
+	  setting the editor or standin in editable cases.
+
+
+	* mpulsweb/lib/config.py: Issue1066: Added new config var to determine
+	if we need to check the full consitence of a case or just the minimal
+	requirements for anonymisation.
+	* mpulsweb/model/case.py (MpulsCase.check_anonymizeability):
+	Issue1066: Adapted logic in controller to planned workflow for anonymisation 
+
 2010-09-15  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/templates/evaluation/evaluate.mako: Add note about the
@@ -146,6 +176,7 @@
 	* mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po: issue1064: consequent use
 	  of the word "Einwilligungserklaerung" for the declaration of consent
 
+>>>>>>> .r3652
 2010-09-09  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	Issue1023: