From 20e263932360867e451fdfb96861b6f8c17560f2 Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Tue, 5 Mar 2019 14:18:56 +0100 Subject: [PATCH] set allow_null for integerfields, when they are not required --- .../app/site/motions/services/local-permissions.service.ts | 2 ++ openslides/motions/serializers.py | 4 ++-- openslides/topics/serializers.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/src/app/site/motions/services/local-permissions.service.ts b/client/src/app/site/motions/services/local-permissions.service.ts index a884431d3..b41ca247b 100644 --- a/client/src/app/site/motions/services/local-permissions.service.ts +++ b/client/src/app/site/motions/services/local-permissions.service.ts @@ -109,6 +109,7 @@ export class LocalPermissionsService { motion.state.allow_submitter_edit && motion.submitters && motion.submitters.length && + !this.operator.isAnonymous && motion.submitters.some(submitter => submitter.id === this.operator.user.id)) ); } @@ -139,6 +140,7 @@ export class LocalPermissionsService { this.operator.hasPerms('motions.can_manage_metadata') || (motion.state && motion.state.allow_submitter_edit && + !this.operator.isAnonymous && motion.submitters && motion.submitters.some(submitter => submitter.id === this.operator.user.id)) ); diff --git a/openslides/motions/serializers.py b/openslides/motions/serializers.py index ad9a4f390..62f9eae2d 100644 --- a/openslides/motions/serializers.py +++ b/openslides/motions/serializers.py @@ -68,7 +68,7 @@ class MotionBlockSerializer(ModelSerializer): """ 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) @@ -397,7 +397,7 @@ class MotionSerializer(ModelSerializer): min_value=1, required=False, validators=[validate_workflow_field] ) 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) submitters = SubmitterSerializer(many=True, read_only=True) diff --git a/openslides/topics/serializers.py b/openslides/topics/serializers.py index 96388e507..5bc2a5433 100644 --- a/openslides/topics/serializers.py +++ b/openslides/topics/serializers.py @@ -11,7 +11,7 @@ class TopicSerializer(ModelSerializer): """ 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) agenda_comment = CharField(write_only=True, required=False, allow_blank=True)