Merge pull request #6001 from jsangmeister/fix-recommendation-extension-bug

Recommendation extension can be set with can_manage_metadata
This commit is contained in:
Emanuel Schütze 2021-04-08 18:30:08 +02:00 committed by GitHub
commit d80919f0e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 1 deletions

View File

@ -273,7 +273,14 @@ class MotionViewSet(TreeSortMixin, ModelViewSet):
if has_perm(request.user, "motions.can_manage_metadata"): if has_perm(request.user, "motions.can_manage_metadata"):
whitelist.extend( whitelist.extend(
("category_id", "motion_block_id", "origin", "supporters_id") (
"category_id",
"motion_block_id",
"origin",
"supporters_id",
"state_extension",
"recommendation_extension",
)
) )
for key in keys: for key in keys:

View File

@ -2,6 +2,7 @@ import json
import pytest import pytest
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.models import Permission
from django.urls import reverse from django.urls import reverse
from rest_framework import status from rest_framework import status
from rest_framework.test import APIClient from rest_framework.test import APIClient
@ -20,6 +21,7 @@ from openslides.motions.models import (
Workflow, Workflow,
) )
from openslides.poll.models import BasePoll from openslides.poll.models import BasePoll
from openslides.utils.auth import get_group_model
from openslides.utils.autoupdate import inform_changed_data from openslides.utils.autoupdate import inform_changed_data
from tests.common_groups import GROUP_ADMIN_PK, GROUP_DELEGATE_PK from tests.common_groups import GROUP_ADMIN_PK, GROUP_DELEGATE_PK
from tests.count_queries import count_queries from tests.count_queries import count_queries
@ -497,6 +499,37 @@ class UpdateMotion(TestCase):
# Forbidden because of changed workflow state. # Forbidden because of changed workflow state.
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
def test_patch_recommendation_extension(self):
group = get_group_model().objects.get(pk=GROUP_DELEGATE_PK)
group.permissions.clear()
group.permissions.add(
Permission.objects.get(
content_type__app_label="motions",
codename="can_see",
),
Permission.objects.get(
content_type__app_label="motions",
codename="can_manage_metadata",
),
)
group.save()
password = "test_password_lln8tep0UdxDvFDW"
user = get_user_model().objects.create_user(
username="test_username_cuZUI20g3AUbcFVC",
password=password,
)
user.groups.add(group)
user.save()
self.client.login(username=user.username, password=password)
response = self.client.patch(
reverse("motion-detail", args=[self.motion.pk]),
{"recommendation_extension": "extension"},
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
motion = Motion.objects.get()
self.assertEqual(motion.recommendation_extension, "extension")
class DeleteMotion(TestCase): class DeleteMotion(TestCase):
""" """