# HG changeset patch
# User Denis Laxalde <denis.laxalde@logilab.fr>
# Date 1485444896 -3600
# Node ID 5f886dc718abe982c76581304b1d007c00e6b3f1
# Parent  a033762137473545da907c31ec490793ab014b32
[web] Handle unspecified value in TZDatetimeField

`field._ensure_correctly_typed(self, form, value)` should return None if value
is None.

Closes #17050181.

diff -r a03376213747 -r 5f886dc718ab cubicweb/web/formfields.py
--- a/cubicweb/web/formfields.py	Thu Jan 26 16:33:15 2017 +0100
+++ b/cubicweb/web/formfields.py	Thu Jan 26 16:34:56 2017 +0100
@@ -1027,6 +1027,8 @@
     def _ensure_correctly_typed(self, form, value):
         tz_naive = super(TZDatetimeField, self)._ensure_correctly_typed(
             form, value)
+        if not tz_naive:
+            return None
         return tz_naive.replace(tzinfo=pytz.utc)
 
 
diff -r a03376213747 -r 5f886dc718ab cubicweb/web/test/unittest_form.py
--- a/cubicweb/web/test/unittest_form.py	Thu Jan 26 16:33:15 2017 +0100
+++ b/cubicweb/web/test/unittest_form.py	Thu Jan 26 16:34:56 2017 +0100
@@ -265,9 +265,12 @@
 <p><b>You can either submit a new file using the browse button above, or choose to remove already uploaded file by checking the "detach attached file" check-box, or edit file content online with the widget below.</b></p>
 <textarea cols="80" name="data-subject:%(eid)s" onkeyup="autogrow(this)" rows="3" tabindex="4">new widgets system</textarea>''' % {'eid': file.eid})
 
-    def _modified_tzdatenaiss(self, eid, datestr, timestr):
-        ctx = {'tzdatenaiss-subjectdate:%d' % eid: datestr,
-               'tzdatenaiss-subjecttime:%d' % eid: timestr}
+    def _modified_tzdatenaiss(self, eid, date_and_time_str=None):
+        ctx = {}
+        if date_and_time_str:
+            datestr, timestr = date_and_time_str
+            ctx['tzdatenaiss-subjectdate:%d' % eid] = datestr
+            ctx['tzdatenaiss-subjecttime:%d' % eid] = timestr
         with self.admin_access.web_request(**ctx) as req:
             form = EntityFieldsForm(req, None, entity=req.entity_from_eid(eid))
             field = TZDatetimeField(name='tzdatenaiss', eidparam=True,
@@ -285,10 +288,13 @@
             eid = req.create_entity('Personne', nom=u'Flo', tzdatenaiss=tzd).eid
             req.cnx.commit()
 
-        modified = self._modified_tzdatenaiss(eid, datestr, timestr)
+        modified = self._modified_tzdatenaiss(eid, (datestr, timestr))
         self.assertFalse(modified)
 
-        modified = self._modified_tzdatenaiss(eid, '2016/05/04', '15:07')
+        modified = self._modified_tzdatenaiss(eid, ('2016/05/04', '15:07'))
+        self.assertTrue(modified)
+
+        modified = self._modified_tzdatenaiss(eid, None)
         self.assertTrue(modified)
 
     def test_passwordfield(self):