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

Merge pull request #4459 from FinnStutzenstein/fixUpdatingMotions

Browse Source 
set allow_null for integerfields, when they are not required
This commit is contained in:
Emanuel Schütze 2019-03-05 15:02:26 +01:00 committed by GitHub
commit 1fecf941c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/site/motions/services/local-permissions.service.ts
View File

@ -109,6 +109,7 @@ export class LocalPermissionsService {
motion.state.allow_submitter_edit && motion.state.allow_submitter_edit &&
motion.submitters && motion.submitters &&
motion.submitters.length && motion.submitters.length &&
!this.operator.isAnonymous &&
motion.submitters.some(submitter => submitter.id === this.operator.user.id)) motion.submitters.some(submitter => submitter.id === this.operator.user.id))
); );
} }
@ -139,6 +140,7 @@ export class LocalPermissionsService {
this.operator.hasPerms('motions.can_manage_metadata') || this.operator.hasPerms('motions.can_manage_metadata') ||
(motion.state && (motion.state &&
motion.state.allow_submitter_edit && motion.state.allow_submitter_edit &&
!this.operator.isAnonymous &&
motion.submitters && motion.submitters &&
motion.submitters.some(submitter => submitter.id === this.operator.user.id)) motion.submitters.some(submitter => submitter.id === this.operator.user.id))
); );

4
openslides/motions/serializers.py
View File

@ -68,7 +68,7 @@ class MotionBlockSerializer(ModelSerializer):
""" """
agenda_type = IntegerField( 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_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] min_value=1, required=False, validators=[validate_workflow_field]
) )
agenda_type = IntegerField( 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_parent_id = IntegerField(write_only=True, required=False, min_value=1)
submitters = SubmitterSerializer(many=True, read_only=True) submitters = SubmitterSerializer(many=True, read_only=True)

2
openslides/topics/serializers.py
View File

@ -11,7 +11,7 @@ class TopicSerializer(ModelSerializer):
""" """
agenda_type = IntegerField( 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_parent_id = IntegerField(write_only=True, required=False, min_value=1)
agenda_comment = CharField(write_only=True, required=False, allow_blank=True) agenda_comment = CharField(write_only=True, required=False, allow_blank=True)