Merge pull request #4645 from FinnStutzenstein/renameManageRestriction

Rename the manage restriction field

client/src/app/site/motions/modules/motion-workflow/components/workflow-detail/workflow-detail.component.ts

@@ -117,7 +117,7 @@ export class WorkflowDetailComponent extends BaseViewComponent implements OnInit
      * Determines possible restrictions
      */
     public restrictions = [
-        { key: 'managers_only', label: 'Can manage motions' },
+        { key: 'motions.can_manage', label: 'Can manage motions' },
         { key: 'motions.can_see_internal', label: 'Can see motions in internal state' },
         { key: 'motions.can_manage_metadata', label: 'Can manage motion metadata' },
         { key: 'is_submitter', label: 'Submitters' }

openslides/motions/access_permissions.py

@@ -48,21 +48,16 @@ class MotionAccessPermissions(BaseAccessPermissions):
                     # Parse values of restriction field.
                     # If at least one restriction is ok, permissions are granted.
                     for value in restriction:
-                        if value == "managers_only":
+                        if value in (
-                            # permission remains false, becuase the user does not
-                            # have this permission (see above); continue to check other fields
-                            continue
-                        elif value in (
                             "motions.can_see_internal",
                             "motions.can_manage_metadata",
-                        ):
+                            "motions.can_manage",
-                            if await async_has_perm(user_id, value):
+                        ) and await async_has_perm(user_id, value):
-                                permission = True
+                            permission = True
-                                break
+                            break
-                        elif value == "is_submitter":
+                        elif value == "is_submitter" and is_submitter:
-                            if is_submitter:
+                            permission = True
-                                permission = True
+                            break
-                                break
 
                 # Parse single motion.
                 if permission:

openslides/motions/migrations/0026_rename_restriction.py

@@ -0,0 +1,22 @@
+# Generated by Finn Stutzenstein on 2019-04-29 08:51
+
+from django.db import migrations
+
+
+def rename_manager_restriction(apps, schema_editor):
+    """
+    Renames 'managers_only' to 'motions.can_manage'
+    """
+    State = apps.get_model("motions", "State")
+    for state in State.objects.all():
+        for i in range(len(state.restriction)):
+            if state.restriction[i] == "managers_only":
+                state.restriction[i] = "motions.can_manage"
+        state.save(skip_autoupdate=True)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("motions", "0025_motion_category_weight")]
+
+    operations = [migrations.RunPython(rename_manager_restriction)]

openslides/motions/models.py

@@ -1019,13 +1019,12 @@ class State(RESTModelMixin, models.Model):
     Contains a list of one or more of the following strings:
      * motions.can_see_internal
      * motions.can_manage_metadata
+     * motions.can_manage
      * is_submitter
-     * managers_only
 
     If the list is empty, everybody with the general permission to see motions
-    can see this motion. If the list contains 'managers_only', only managers with
+    can see this motion. If the list contains at least one item, the user needs
-    motions.can_manage permission may see this motion. In all other cases the user
+    the permission (or have the attribute) for at least one of the restrictions.
-    shall have one of the given permissions respectivly is submitter of the motion.
 
     Default: Empty list so everybody can see the motion.
     """

openslides/motions/serializers.py

@@ -131,8 +131,8 @@ class StateSerializer(ModelSerializer):
                 "enum": [
                     "motions.can_see_internal",
                     "motions.can_manage_metadata",
+                    "motions.can_manage",
                     "is_submitter",
-                    "managers_only",
                 ],
             },
         }

tests/integration/motions/test_viewset.py

@@ -481,7 +481,7 @@ class RetrieveMotion(TestCase):
         config["general_system_enable_anonymous"] = True
         guest_client = APIClient()
         state = self.motion.state
-        state.restriction = ["managers_only"]
+        state.restriction = ["motions.can_manage"]
         state.save()
         # The cache has to be cleared, see:
         # https://github.com/OpenSlides/OpenSlides/issues/3396
@@ -492,7 +492,7 @@ class RetrieveMotion(TestCase):
 
     def test_admin_state_with_restriction(self):
         state = self.motion.state
-        state.restriction = ["managers_only"]
+        state.restriction = ["motions.can_manage"]
         state.save()
         response = self.client.get(reverse("motion-detail", args=[self.motion.pk]))
         self.assertEqual(response.status_code, status.HTTP_200_OK)