Make changes

openslides_backend/action/actions/motion/create_forwarded.py

@@ -43,5 +43,10 @@ def check_permissions(self, instance: dict[str, Any]) -> None:
     def create_amendments(self, amendment_data: ActionData) -> ActionResults | None:
         return self.execute_other_action(MotionCreateForwardedAmendment, amendment_data)
 
+    def update_instance(self, instance: dict[str, Any]) -> dict[str, Any]:
+        self.with_amendments = instance.pop("with_amendments", False)
+        super().update_instance(instance)
+        return instance
+
     def should_forward_amendments(self, instance: dict[str, Any]) -> bool:
-        return instance.pop("with_amendments", False)
+        return self.with_amendments

openslides_backend/action/actions/user/create.py

@@ -51,7 +51,6 @@ class UserCreate(
             "is_present_in_meeting_ids",
             "committee_management_ids",
             "is_demo_user",
-            # "forwarding_committee_ids",
             "saml_id",
             "member_number",
         ],

openslides_backend/action/actions/user/create_update_permissions_mixin.py

@@ -213,9 +213,6 @@ def check_permissions(self, instance: dict[str, Any]) -> None:
         """
         self.assert_not_anonymous()
 
-        # if "forwarding_committee_ids" in instance:
-        #     raise PermissionDenied("forwarding_committee_ids is not allowed.")
-
         if not hasattr(self, "permstore"):
             self.permstore = PermissionVarStore(
                 self.datastore, self.user_id, self.permission

tests/system/action/meeting/test_import.py

@@ -823,35 +823,6 @@ def test_check_usernames_new_and_twice(self) -> None:
         )
         self.assert_model_not_exists("user/3")
 
-    # def test_with_forwarding_committees(self) -> None:
-    #     request_data = self.create_request_data(
-    #         {
-    #             "user": {
-    #                 "2": self.get_user_data(
-    #                     2,
-    #                     {
-    #                         "username": "user2",
-    #                         "last_name": "new user",
-    #                         "email": "[email protected]",
-    #                         "forwarding_committee_ids": [4],
-    #                     },
-    #                 )
-    #             }
-    #         }
-    #     )
-
-    #     response = self.request("meeting.import", request_data)
-    #     self.assert_status_code(response, 200)
-    #     user2 = self.assert_model_exists(
-    #         "user/3",
-    #         {
-    #             "username": "user2",
-    #             "last_name": "new user",
-    #             "email": "[email protected]",
-    #         },
-    #     )
-    #     assert not user2.get("forwarding_committee_ids")
-
     def test_check_negative_default_vote_weight(self) -> None:
         request_data = self.create_request_data({})
         request_data["meeting"]["user"]["1"] = self.get_user_data(

tests/system/action/user/test_create.py

@@ -1217,18 +1217,6 @@ def test_create_default_vote_weight_none(self) -> None:
         user = self.get_model("user/2")
         assert "default_vote_weight" not in user
 
-    # def test_create_forwarding_committee_ids_not_allowed(self) -> None:
-    #     self.set_models({"meeting/1": {"is_active_in_organization_id": 1}})
-    #     response = self.request(
-    #         "user.create",
-    #         {
-    #             "username": "test_Xcdfgee",
-    #             "forwarding_committee_ids": [],
-    #         },
-    #     )
-    #     self.assert_status_code(response, 403)
-    #     assert "forwarding_committee_ids is not allowed." in response.json["message"]
-
     def test_create_negative_vote_weight(self) -> None:
         self.set_models(
             {