Merge pull request #59 from seanupton/master

DateWidget, DatetimeWidget (pick-a-date) now able to clear previous

CHANGES.rst

@@ -14,6 +14,9 @@ New features:
 
 Bug fixes:
 
+- DateWidget, DatetimeWidget now able to clear previous values.
+  [seanupton]
+
 - Use zope.interface decorator.
   [gforcada]
 

Products/Archetypes/Widget.py

@@ -1023,6 +1023,10 @@ def process_form(self, instance, field, form, empty_marker=None):
 
         value = value.split('-')
 
+        if value[0] == '':
+            # empty value, clear any previous value
+            return None, {}
+
         try:
             value = DateTime(datetime(*map(int, value)))
         except:
@@ -1102,8 +1106,11 @@ def process_form(self, instance, field, form, empty_marker=None):
             return empty_marker
 
         tmp = value.split(' ')
+
         if not tmp[0]:
-            return empty_marker
+            # empty: clear, not preserve, any previous value
+            return None, {}
+
         value = tmp[0].split('-')
         if len(tmp) == 2 and ':' in tmp[1]:
             value += tmp[1].split(':')

Products/Archetypes/tests/test_pawidgets.py

@@ -124,6 +124,16 @@ def test_process_form(self):
             (datetime(2011, 11, 22))
         )
 
+    def test_process_form_empty_existing(self):
+        form = {
+            'fieldname': ''
+        }
+        self.assertEqual(
+            self.widget.process_form(
+                self.context, self.field, form)[0],
+            None
+        )
+
 
 class DatetimeWidgetTests(unittest.TestCase):
 
@@ -188,6 +198,16 @@ def test_process_form(self):
             (datetime(2011, 11, 22, 13, 30))
         )
 
+    def test_process_form_empty_existing(self):
+        form = {
+            'fieldname': ''
+        }
+        self.assertEqual(
+            self.widget.process_form(
+                self.context, self.field, form)[0],
+            None
+        )
+
 
 class SelectWidgetTests(unittest.TestCase):