[Mpuls-commits] r1488 - wasko/branches/2.0

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-11 08:30:59 +0100 (Thu, 11 Feb 2010)
New Revision: 1488

Modified:
   wasko/branches/2.0/ChangeLog
Log:
Updated ChangeLog


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-11 07:27:27 UTC (rev 1487)
+++ wasko/branches/2.0/ChangeLog	2010-02-11 07:30:59 UTC (rev 1488)
@@ -1,3 +1,40 @@
+2010-02-11  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	Moved appointment to base.
+
+	* mpulsweb/lib/validators.py (TimeCheck), (DateCheck),
+	(CreateAppointmentForm), (StringTooLong): Copied from waskaweb. 
+	* waskaweb/lib/validators.py (DateCheck), (TimeCheck),
+	(CreateAppointmentForm), (StringTooLong): Deleted imported from
+	mpulsweb now.
+	* mpulsweb/controllers/appointment.py,
+	waskaweb/controllers/appointment.py: Moved controller to mpulsbase.
+	Adapted imports.
+	* waskaweb/templates/appointments,
+	mpulsweb/templates/appointments: Moved templates
+	* mpulsweb/controllers/appointment.py (AppointmentController): Adapted
+	c-vars fro dialogs.
+
+2010-02-10  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	Move appointments to base
+
+	* waskaweb/model/appointment.py: Import session from mpuls.lib.base 
+	* mpulsweb/model/appointment.py: New. Copied from
+	waskaweb.model.appointments. Deleted case-related functions. 
+	* waskaweb/model/appointment.py: Deleted all classes and vars which
+	are not defined in mpulsweb.model.appointment. Import them from there. 
+	* mpulsweb/controllers/mpuls.py (get_global_appointments): Copied from
+	waskaweb. Load global appointments
+	* waskaweb/controllers/waska.py (get_global_appointments): Deleted.
+	Import from mpulsweb now. 
+	* waskaweb/controllers/waska.py (get_newslist): Deleted.  
+	* mpulsweb/templates/home/globalappointmentlist.mako: Copied from
+	waskaweb. Use format_date function instead of dd_mm_YYYY 
+	* mpulsweb/templates/home/home.mako: Display global appointments.
+	* waskaweb/controllers/appointment.py: Import from mpulsbase as far as
+	  possible.
+
 2010-02-10  Bernhard Herzog  <bh at intevation.de>
 
 	* waskaweb/controllers/case.py (checkPrivacyStatement.validate):
@@ -94,7 +131,6 @@
 	* mpulsweb/controllers/mpuls.py (get_newslist): Copied from mpulsbase. 
 	* mpulsweb/controllers/mpuls.py (MpulsController.index): Load news if
 	enabled.
-	* waskaweb/controllers/waska.py (get_newslist): Deleted.  
 
 2010-02-09  Bernhard Herzog  <bh at intevation.de>