Merge pull request #5925 from FinnStutzenstein/models

Adjusted models
This commit is contained in:
Finn Stutzenstein 2021-03-08 12:00:44 +01:00 committed by GitHub
commit 0a3d511322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 19 deletions

View File

@ -346,6 +346,7 @@
"meeting.can_see_frontpage", "meeting.can_see_frontpage",
"meeting.can_see_history", "meeting.can_see_history",
"motion.can_manage", "motion.can_manage",
"poll.can_manage",
"projector.can_manage", "projector.can_manage",
"tag.can_manage", "tag.can_manage",
"user.can_manage", "user.can_manage",

View File

@ -482,6 +482,7 @@
"meeting.can_see_frontpage", "meeting.can_see_frontpage",
"meeting.can_see_history", "meeting.can_see_history",
"motion.can_manage", "motion.can_manage",
"poll.can_manage",
"projector.can_manage", "projector.can_manage",
"tag.can_manage", "tag.can_manage",
"user.can_manage", "user.can_manage",

View File

@ -909,6 +909,7 @@ group:
- motion.can_see - motion.can_see
- motion.can_see_internal - motion.can_see_internal
- motion.can_support - motion.can_support
- poll.can_manage
- projector.can_manage - projector.can_manage
- projector.can_see - projector.can_see
- tag.can_manage - tag.can_manage
@ -1452,8 +1453,12 @@ motion_block:
motion_change_recommendation: motion_change_recommendation:
id: number id: number
rejected: boolean rejected:
internal: boolean type: boolean
default: false
internal:
type: boolean
default: false
type: type:
type: string type: string
enum: enum:
@ -1507,11 +1512,22 @@ motion_state:
- motion.can_manage_metadata - motion.can_manage_metadata
- motion.can_manage - motion.can_manage
- is_submitter - is_submitter
allow_support: boolean default: []
allow_create_poll: boolean allow_support:
allow_submitter_edit: boolean type: boolean
set_number: boolean default: false
show_state_extension_field: boolean allow_create_poll:
type: boolean
default: false
allow_submitter_edit:
type: boolean
default: false
set_number:
type: boolean
default: true
show_state_extension_field:
type: boolean
default: false
merge_amendment_into_final: merge_amendment_into_final:
type: string type: string
enum: enum:
@ -1519,7 +1535,9 @@ motion_state:
- undefined - undefined
- do_merge - do_merge
default: undefined default: undefined
show_recommendation_extension_field: boolean show_recommendation_extension_field:
type: boolean
default: false
next_state_ids: next_state_ids:
type: relation-list type: relation-list

View File

@ -10,11 +10,20 @@ agenda_item:
can_manage: can_manage:
can_see_internal: can_see_internal:
can_see: can_see:
assignment:
can_manage:
can_nominate_other:
can_see:
can_nominate_self:
can_see:
list_of_speakers: list_of_speakers:
can_manage: can_manage:
can_see: can_see:
can_be_speaker: can_be_speaker:
can_see: can_see:
mediafile:
can_manage:
can_see:
meeting: meeting:
can_manage_settings: can_manage_settings:
can_manage_logos_and_fonts: can_manage_logos_and_fonts:
@ -22,11 +31,6 @@ meeting:
can_see_autopilot: can_see_autopilot:
can_see_livestream: can_see_livestream:
can_see_history: can_see_history:
projector:
can_manage:
can_see:
tag:
can_manage:
motion: motion:
can_manage: can_manage:
can_manage_metadata: can_manage_metadata:
@ -41,15 +45,13 @@ motion:
can_see: can_see:
can_support: can_support:
can_see: can_see:
assignment: poll:
can_manage: can_manage:
can_nominate_other: projector:
can_see:
can_nominate_self:
can_see:
mediafile:
can_manage: can_manage:
can_see: can_see:
tag:
can_manage:
user: user:
can_manage: can_manage:
can_see_extra_data: can_see_extra_data: