[Cherry-Pick] make meeting clone with gender in user possible again

openslides_backend/action/actions/meeting/clone.py

@@ -92,7 +92,7 @@ def check_permissions(self, instance: dict[str, Any]) -> None:
         MeetingPermissionMixin.check_permissions(self, instance)
 
     def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
-        meeting_json = export_meeting(self.datastore, instance["meeting_id"])
+        meeting_json = export_meeting(self.datastore, instance["meeting_id"], True)
         instance["meeting"] = meeting_json
         additional_user_ids = instance.pop("user_ids", None) or []
         additional_admin_ids = instance.pop("admin_ids", None) or []

openslides_backend/shared/export_helper.py

@@ -21,7 +21,9 @@
 FORBIDDEN_FIELDS = ["forwarded_motion_ids"]
 
 
-def export_meeting(datastore: DatastoreService, meeting_id: int) -> dict[str, Any]:
+def export_meeting(
+    datastore: DatastoreService, meeting_id: int, internal_target: bool = False
+) -> dict[str, Any]:
     export: dict[str, Any] = {}
 
     # fetch meeting
@@ -129,7 +131,7 @@ def export_meeting(datastore: DatastoreService, meeting_id: int) -> dict[str, An
                     elif collection_from_fqid(entry[field_name]) == "meeting_user":
                         id_ = id_from_fqid(entry[field_name])
                         user_ids.add(results["meeting_user"][id_]["user_id"])
-    add_users(list(user_ids), export, meeting_id, datastore)
+    add_users(list(user_ids), export, meeting_id, datastore, internal_target)
     return export
 
 
@@ -138,6 +140,7 @@ def add_users(
     export_data: dict[str, Any],
     meeting_id: int,
     datastore: DatastoreService,
+    internal_target: bool,
 ) -> None:
     if not user_ids:
         return
@@ -157,15 +160,16 @@ def add_users(
     )
 
     for user in users.values():
-        gender_dict = datastore.get_all("gender", ["name"], lock_result=False)
         user["meeting_ids"] = [meeting_id]
         if meeting_id in (user.get("is_present_in_meeting_ids") or []):
             user["is_present_in_meeting_ids"] = [meeting_id]
         else:
             user["is_present_in_meeting_ids"] = None
-        if user.get("gender_id"):
-            user["gender"] = gender_dict.get(user["gender_id"], {}).get("name")
-            del user["gender_id"]
+        if not internal_target:
+            gender_dict = datastore.get_all("gender", ["name"], lock_result=False)
+            if user.get("gender_id"):
+                user["gender"] = gender_dict.get(user["gender_id"], {}).get("name")
+                del user["gender_id"]
         # limit user fields to exported objects
         collection_field_tupels = [
             ("meeting_user", "meeting_user_ids"),

tests/system/action/meeting/test_clone.py

@@ -785,10 +785,12 @@ def test_clone_new_committee_and_user_with_group(self) -> None:
                     "meeting_user_ids": [2],
                     "meeting_ids": [1],
                     "organization_id": 1,
+                    "gender_id": 1,
                 },
+                "gender/1": {"name": "male", "organization_id": 1, "user_ids": [3]},
                 "group/1": {"meeting_user_ids": [2]},
                 "committee/2": {"organization_id": 1},
-                "organization/1": {"committee_ids": [1, 2]},
+                "organization/1": {"committee_ids": [1, 2], "gender_ids": [1]},
                 "meeting/1": {"user_ids": [1, 13], "meeting_user_ids": [1, 2]},
                 "meeting_user/2": {
                     "meeting_id": 1,
@@ -818,6 +820,7 @@ def test_clone_new_committee_and_user_with_group(self) -> None:
                 "committee_ids": [1, 2],
                 "meeting_ids": [1, 2],
                 "meeting_user_ids": [2, 4],
+                "gender_id": 1,
             },
         )
         self.assert_model_exists(