[Mpuls-commits] r5020 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-05-27 15:29:53 +0200 (Fri, 27 May 2011)
New Revision: 5020

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/validators.py
Log:
Issue1972: Revert the patch of the 2011-05-27. The old behavior is used.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-05-27 12:29:34 UTC (rev 5019)
+++ base/trunk/ChangeLog	2011-05-27 13:29:53 UTC (rev 5020)
@@ -1,3 +1,9 @@
+2011-05-27  Ludwig Reiter <ludwig.reiter at intevation.de>
+
+	* mpulsweb/lib/validators.py:
+	Issue1972: Revert of the Patch of the 2011-05-27.
+	The old behavior is used.
+
 2011-05-27  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/templates/casemanagement/digest.mako: Issue1913: Added ID of case to
@@ -53,7 +59,6 @@
 2011-05-25  Ludwig Reiter <ludwig.reiter at inteation.de>
 
 	* mpulsweb/lib/validators.py:
-	Issue1972: Modification to the CreateAppointmentForm validator.
 	Start/end/date/time should not be empty and no defaults are choosen,
 	because the defaults were confusing.
 

Modified: base/trunk/mpulsweb/lib/validators.py
===================================================================
--- base/trunk/mpulsweb/lib/validators.py	2011-05-27 12:29:34 UTC (rev 5019)
+++ base/trunk/mpulsweb/lib/validators.py	2011-05-27 13:29:53 UTC (rev 5020)
@@ -610,10 +610,10 @@
 class CreateAppointmentForm(BaseFormValidator):
 
     start_date = MyDateConverter(not_empty=True, month_style='dd.mm.jjjj')
-    start_time = TimeConverter(not_empty=True, use_datetime=True)
+    start_time = TimeConverter(if_empty="00:00", use_datetime=True)
 
-    end_date = MyDateConverter(not_empty=True, month_style='dd.mm.jjjj')
-    end_time = TimeConverter(not_empty=True, use_datetime=True)
+    end_date = MyDateConverter(month_style='dd.mm.jjjj')
+    end_time = TimeConverter(use_datetime=True)
 
     chained_validators = [DateOrder('start_date', 'end_date')]
     title = All(String(not_empty=True), MaxLength(128))