ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Requires agenda.can_manage for settings ageda item information on content object creation

Browse Source
This commit is contained in:
FinnStutzenstein 2019-07-10 08:31:58 +02:00
parent af538436e3
commit 0d5e795f50
5 changed files with 67 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.html
View File

@ -1,4 +1,5 @@
<ng-container *ngIf="showForm">
<ng-container *osPerms="'agenda.can_manage'">
<ng-container *ngIf="showForm">
<div [formGroup]="form">
<mat-checkbox formControlName="agenda_create">
<span translate>Add to agenda</span>
@ -29,4 +30,5 @@
></os-search-value-selector>
</div>
</ng-container>
</ng-container>
</ng-container>

16
openslides/assignments/serializers.py
View File

@ -2,6 +2,7 @@ from django.db import transaction
from openslides.poll.serializers import default_votes_validator
from openslides.utils.rest_api import (
BooleanField,
DecimalField,
DictField,
IntegerField,
@ -11,6 +12,7 @@ from openslides.utils.rest_api import (
ValidationError,
)
from ..utils.auth import has_perm
from ..utils.autoupdate import inform_changed_data
from ..utils.validate import validate_html
from .models import (
@ -186,8 +188,9 @@ class AssignmentFullSerializer(ModelSerializer):
many=True, read_only=True
)
polls = AssignmentAllPollSerializer(many=True, read_only=True)
agenda_create = BooleanField(write_only=True, required=False, allow_null=True)
agenda_type = IntegerField(
write_only=True, required=False, min_value=1, max_value=3
write_only=True, required=False, min_value=1, max_value=3, allow_null=True
)
agenda_parent_id = IntegerField(write_only=True, required=False, min_value=1)
@ -204,6 +207,7 @@ class AssignmentFullSerializer(ModelSerializer):
"polls",
"agenda_item_id",
"list_of_speakers_id",
"agenda_create",
"agenda_type",
"agenda_parent_id",
"tags",
@ -221,13 +225,19 @@ class AssignmentFullSerializer(ModelSerializer):
Customized create method. Set information about related agenda item
into agenda_item_update_information container.
"""
agenda_type = validated_data.pop("agenda_type", None)
agenda_parent_id = validated_data.pop("agenda_parent_id", None)
tags = validated_data.pop("tags", [])
attachments = validated_data.pop("attachments", [])
request_user = validated_data.pop("request_user") # this should always be there
agenda_create = validated_data.pop("agenda_create", None)
agenda_type = validated_data.pop("agenda_type", None)
agenda_parent_id = validated_data.pop("agenda_parent_id", None)
assignment = Assignment(**validated_data)
if has_perm(request_user, "agenda.can_manage"):
assignment.agenda_item_update_information["create"] = agenda_create
assignment.agenda_item_update_information["type"] = agenda_type
assignment.agenda_item_update_information["parent_id"] = agenda_parent_id
assignment.save()
assignment.tags.add(*tags)
assignment.attachments.add(*attachments)

3
openslides/assignments/views.py
View File

@ -66,6 +66,9 @@ class AssignmentViewSet(ModelViewSet):
result = False
return result
def perform_create(self, serializer):
serializer.save(request_user=self.request.user)
@detail_route(methods=["post", "delete"])
def candidature_self(self, request, pk=None):
"""

5
openslides/motions/serializers.py
View File

@ -5,7 +5,7 @@ from django.db import transaction
from ..core.config import config
from ..poll.serializers import default_votes_validator
from ..utils.auth import get_group_model
from ..utils.auth import get_group_model, has_perm
from ..utils.autoupdate import inform_changed_data
from ..utils.rest_api import (
BooleanField,
@ -97,7 +97,9 @@ class MotionBlockSerializer(ModelSerializer):
agenda_create = validated_data.pop("agenda_create", None)
agenda_type = validated_data.pop("agenda_type", None)
agenda_parent_id = validated_data.pop("agenda_parent_id", None)
request_user = validated_data.pop("request_user") # this should always be there
motion_block = MotionBlock(**validated_data)
if has_perm(request_user, "agenda.can_manage"):
motion_block.agenda_item_update_information["create"] = agenda_create
motion_block.agenda_item_update_information["type"] = agenda_type
motion_block.agenda_item_update_information["parent_id"] = agenda_parent_id
@ -535,6 +537,7 @@ class MotionSerializer(ModelSerializer):
motion.parent = validated_data.get("parent")
motion.statute_paragraph = validated_data.get("statute_paragraph")
motion.reset_state(validated_data.get("workflow_id"))
if has_perm(validated_data["request_user"], "agenda.can_manage"):
motion.agenda_item_update_information["create"] = validated_data.get(
"agenda_create"
)

3
openslides/motions/views.py
View File

@ -1444,6 +1444,9 @@ class MotionBlockViewSet(ModelViewSet):
result = False
return result
def perform_create(self, serializer):
serializer.save(request_user=self.request.user)
@detail_route(methods=["post"])
def follow_recommendations(self, request, pk=None):
"""