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

Merge pull request #5587 from normanjaeckel/FixBranch

Browse Source 
Fix branch.
This commit is contained in:
Norman Jäckel 2020-09-30 20:11:39 +02:00 committed by GitHub
commit 2a479746cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/models.txt
View File

@ -487,7 +487,7 @@ Interface motion_category {
name: string; name: string;
prefix: string; prefix: string;
weight: number; weight: number;
level: number; // calculated level: number;
parent_id: motion_category/child_ids; parent_id: motion_category/child_ids;
child_ids: (motion_category/parent_id)[]; child_ids: (motion_category/parent_id)[];

16
docs/models.yml
View File

@ -687,6 +687,8 @@ personal_note:
name: personal_note_$_ids name: personal_note_$_ids
type: structured-relation type: structured-relation
replacement: meeting_id replacement: meeting_id
through:
- content_object_id
content_object_id: content_object_id:
type: generic-relation type: generic-relation
to: to:
@ -829,6 +831,8 @@ speaker:
name: speaker_$_ids name: speaker_$_ids
type: structured-relation type: structured-relation
replacement: meeting_id replacement: meeting_id
through:
- list_of_speakers_id
required: true required: true
topic: topic:
@ -994,6 +998,8 @@ motion_submitter:
name: submitted_motion_$_ids name: submitted_motion_$_ids
type: structured-relation type: structured-relation
replacement: meeting_id replacement: meeting_id
through:
- motion_id
motion_id: motion_id:
type: relation type: relation
to: motion/submitter_ids to: motion/submitter_ids
@ -1290,6 +1296,9 @@ motion_vote:
name: motion_vote_$_ids name: motion_vote_$_ids
type: structured-relation type: structured-relation
replacement: meeting_id replacement: meeting_id
through:
- option_id
- poll_id
assignment: assignment:
id: number id: number
@ -1356,6 +1365,8 @@ assignment_candidate:
name: assignment_candidate_$_ids name: assignment_candidate_$_ids
type: structured-relation type: structured-relation
replacement: meeting_id replacement: meeting_id
through:
- assignment_id
assignment_poll: assignment_poll:
id: number id: number
@ -1424,6 +1435,8 @@ assignment_option:
name: assignment_option_$_ids name: assignment_option_$_ids
type: structured-relation type: structured-relation
replacement: meeting_id replacement: meeting_id
through:
- poll_id
vote_ids: vote_ids:
type: relation-list type: relation-list
to: assignment_vote/option_id to: assignment_vote/option_id
@ -1444,6 +1457,9 @@ assignment_vote:
name: assignment_vote_$_ids name: assignment_vote_$_ids
type: structured-relation type: structured-relation
replacement: meeting_id replacement: meeting_id
through:
- option_id
- poll_id
# Mediafiles are delivered by the mediafile server with the URL # Mediafiles are delivered by the mediafile server with the URL
# `<media-prefix>/media/<meeting_id>/path` # `<media-prefix>/media/<meeting_id>/path`