Merge pull request #184 from collective/deserializer-non-required

For the JSON deserializer, skip empty values from non-required fields.

CHANGES.rst

@@ -4,6 +4,10 @@ Changelog
 3.0.3 (unreleased)
 ------------------
 
+- For the JSON deserializer, skip empty values from non-required fields.
+  This fixes a problem where empty non-required fields would break deserialization.
+  [thet]
+
 - configure with `plone/meta`.
   [petschki]
 

src/collective/z3cform/datagridfield/deserializer.py

@@ -18,7 +18,7 @@
 @implementer(IFieldDeserializer)
 @adapter(IRow, IDexterityContent, IBrowserRequest)
 class DatagridRowDeserializer(DefaultFieldDeserializer):
-    def __call__(self, value):
+    def __call__(self, row):
         row_data = {}
 
         for name, field in getFields(self.field.schema).items():
@@ -35,13 +35,18 @@ def __call__(self, value):
             deserializer = queryMultiAdapter(
                 (field, context, self.request), IFieldDeserializer
             )
+
+            value = row.get(name)
+            if value is None:
+                # Skip empty values, e.g. for non-required fields
+                continue
+
             if deserializer is None:
-                # simply add value
-                if name in value:
-                    row_data[name] = value[name]
+                # simply add the value
+                row_data[name] = value
                 continue
 
-            row_data[name] = deserializer(value[name])
+            row_data[name] = deserializer(value)
 
         return row_data