Fix issue with modal inline dialogs. Fix issue with m2m multiple select.

Author: vsdudakov

docs/build.py

@@ -39,6 +39,12 @@ def read_cls_docstring(cls):
 
 def get_versions():
     return [
+        {
+            "version": "0.2.10",
+            "changes": [
+                "Fix issue empty m2m.",
+            ],
+        },
         {
             "version": "0.2.9",
             "changes": [

docs/index.html

@@ -334,8 +334,6 @@ def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
 
         :return: A list of ids.
         """
-        if not ids:
-            return
         m2m_rel = getattr(obj, field)
         m2m_rel.set(ids)
 

fastadmin/models/orms/django.py

@@ -362,11 +362,12 @@ def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) -> None:
         obj = next((i for i in self.model_cls.select(**{key_id: getattr(obj, key_id)})), None)
         if not obj:
             return
-        rel_model_cls = getattr(self.model_cls, field).py_type
-        rel_key_id = self.get_model_pk_name(rel_model_cls)
-        rel_objs = list(rel_model_cls.select(lambda o: getattr(o, rel_key_id) in ids))
         obj.participants.clear()
-        obj.participants.add(rel_objs)
+        if ids:
+            rel_model_cls = getattr(self.model_cls, field).py_type
+            rel_key_id = self.get_model_pk_name(rel_model_cls)
+            rel_objs = list(rel_model_cls.select(lambda o: getattr(o, rel_key_id) in ids))
+            obj.participants.add(rel_objs)
         flush()
         commit()
 

fastadmin/models/orms/ponyorm.py

@@ -400,7 +400,8 @@ async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) ->
                         obj_field_name: obj_id,
                     }
                 )
-            await session.execute(orm_model_field.secondary.insert().values(values))
+            if values:
+                await session.execute(orm_model_field.secondary.insert().values(values))
             await session.commit()
 
     async def orm_save_upload_field(self, obj: Any, field: str, base64: str) -> None:

fastadmin/models/orms/sqlalchemy.py

@@ -323,8 +323,6 @@ async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) ->
 
         :return: A list of ids.
         """
-        if not ids:
-            return
         m2m_rel = getattr(obj, field)
 
         await m2m_rel.clear()
@@ -335,7 +333,8 @@ async def orm_save_m2m_ids(self, obj: Any, field: str, ids: list[int | UUID]) ->
             setattr(remote_model_obj, self.get_model_pk_name(remote_model), rel_id)
             remote_model_obj._saved_in_db = True
             remote_model_objs.append(remote_model_obj)
-        await m2m_rel.add(*remote_model_objs)
+        if remote_model_objs:
+            await m2m_rel.add(*remote_model_objs)
 
     async def orm_save_upload_field(self, obj: Any, field: str, base64: str) -> None:
         """This method is used to save upload field.

fastadmin/models/orms/tortoise.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastadmin"
-version = "0.2.9"
+version = "0.2.10"
 description = "FastAdmin is an easy-to-use Admin Dashboard App for FastAPI/Flask/Django inspired by Django Admin."
 authors = ["Seva D <[email protected]>"]
 license = "MIT"

pyproject.toml

@@ -52,6 +52,41 @@ async def test_change(session_id, admin_models, event, client):
     assert r.status_code == 200, r.text
 
 
+async def test_change_empty_m2m(session_id, admin_models, event, client):
+    assert session_id
+    event_admin_model: ModelAdmin = admin_models[event.__class__]
+
+    r = await client.patch(
+        f"/api/change/{event.get_model_name()}/{event.id}",
+        json={
+            "name": "new name",
+            "participants": [],
+            "rating": 10,
+            "description": "test",
+            "event_type": "PRIVATE",
+            "is_active": True,
+            "start_time": datetime.datetime.now(tz=datetime.UTC).isoformat(),
+            "date": datetime.datetime.now(tz=datetime.UTC).isoformat(),
+            "latitude": 0.2,
+            "longitude": 0.4,
+            # TODO: bug with Decimal
+            # "price": "20.3",
+            "json": {"test": "test"},
+        },
+    )
+
+    assert r.status_code == 200, r.text
+
+    updated_event = await event_admin_model.get_obj(event.id)
+    item = r.json()
+    assert item["id"] == updated_event["id"]
+    assert item["name"] == updated_event["name"]
+    assert item["tournament"] == updated_event["tournament"]
+    assert datetime.datetime.fromisoformat(item["created_at"]) == updated_event["created_at"]
+    assert datetime.datetime.fromisoformat(item["updated_at"]) == updated_event["updated_at"]
+    assert item["participants"] == []
+
+
 async def test_change_405(session_id, event, client):
     assert session_id
     r = await client.get(