edits

Author: timgraham

django_mongodb_backend/fields/embedded_model_array.py

@@ -7,7 +7,7 @@
 
 class EmbeddedModelArrayField(ArrayField):
     def __init__(self, embedded_model, **kwargs):
-        if kwargs.get("size") is not None:
+        if "size" in kwargs:
             raise ValueError("EmbeddedModelArrayField does not support size.")
         super().__init__(EmbeddedModelField(embedded_model), **kwargs)
         self.embedded_model = embedded_model
@@ -33,7 +33,7 @@ def get_db_prep_value(self, value, connection, prepared=False):
 
     def formfield(self, **kwargs):
         # Skip ArrayField.formfield() which has some differeences, including
-        # unneeded "base_field" and "max_length" instea d of "max_num".
+        # unneeded "base_field" and "max_length" instead of "max_num".
         return Field.formfield(
             self,
             **{

django_mongodb_backend/forms/fields/embedded_model_array.py

@@ -5,16 +5,8 @@
 from django.utils.html import format_html, format_html_join
 
 
-def models_to_dicts(models):
-    """
-    Convert initial data (which is a list of model instances or None) to a
-    list of dictionary data suitable for a formset.
-    """
-    return [model_to_dict(model) for model in models or []]
-
-
 class EmbeddedModelArrayField(forms.Field):
-    def __init__(self, model, prefix, max_num=None, extra_forms=3, **kwargs):
+    def __init__(self, model, *, prefix, max_num=None, extra_forms=3, **kwargs):
         self.model = model
         self.prefix = prefix
         self.formset = formset_factory(
@@ -35,10 +27,10 @@ def clean(self, value):
             raise ValidationError(formset.errors + formset.non_form_errors())
         cleaned_data = []
         for data in formset.cleaned_data:
-            # The fallback to True skips empty forms.
-            if data.get("DELETE", True):
+            # The "delete" checkbox isn't part of model data and must be
+            # removed. The fallback to True skips empty forms.
+            if data.pop("DELETE", True):
                 continue
-            data.pop("DELETE")  # The "delete" checkbox isn't part of model data.
             cleaned_data.append(self.model(**data))
         return cleaned_data
 
@@ -74,3 +66,11 @@ class EmbeddedModelArrayWidget(forms.Widget):
 
     def value_from_datadict(self, data, files, name):
         return {key: data[key] for key in data if key.startswith(f"{name}-")}
+
+
+def models_to_dicts(models):
+    """
+    Convert initial data (which is a list of model instances or None) to a
+    list of dictionary data suitable for a formset.
+    """
+    return [model_to_dict(model) for model in models or []]

docs/source/ref/forms.rst

@@ -26,12 +26,12 @@ Some MongoDB-specific fields are available in ``django_mongodb_backend.forms``.
 ``EmbeddedModelArrayField``
 ---------------------------
 
-.. class:: EmbeddedModelArrayField(model, prefix, max_num=None, extra_forms=3, **kwargs)
+.. class:: EmbeddedModelArrayField(model, *, prefix, max_num=None, extra_forms=3, **kwargs)
 
     .. versionadded:: 5.2.0b1
 
     A field which maps to a model. The field will render as a
-    :class:`~django.forms.ModelFormSet`.
+    :class:`ModelFormSet<django.forms.models.BaseModelFormSet>`.
 
     .. attribute:: model
 

docs/source/topics/embedded-models.rst

@@ -1,7 +1,8 @@
 Embedded models
 ===============
 
-Use :class:`~django_mongodb_backend.fields.EmbeddedModelField` to structure
+Use :class:`~django_mongodb_backend.fields.EmbeddedModelField` and
+:class:`~django_mongodb_backend.fields.EmbeddedModelArrayField` to structure
 your data using `embedded documents
 <https://www.mongodb.com/docs/manual/data-modeling/#embedded-data>`_.