Merge pull request #6000 from FinnStutzenstein/organisation_tags

Add organisation tags
This commit is contained in:
Finn Stutzenstein 2021-04-08 14:34:21 +02:00 committed by GitHub
commit 097230b66e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 3 deletions

View File

@ -14,7 +14,8 @@
"enable_electronic_voting": true,
"committee_ids": [1],
"resource_ids": []
"resource_ids": [],
"organisation_tag_ids": []
}],
"user": [
{
@ -65,6 +66,7 @@
"vote_delegations_$_from_ids": []
}],
"resource": [],
"organisation_tag": [],
"committee": [
{
"id": 1,
@ -78,6 +80,7 @@
"manager_ids": [],
"forward_to_committee_ids": [],
"receive_forwardings_from_committee_ids": [],
"organisation_tag_ids": [],
"organisation_id": 1
}],
"meeting": [
@ -245,6 +248,7 @@
"committee_id": 1,
"default_meeting_for_committee_id": 1,
"organisation_tag_ids": [],
"present_user_ids": [],
"temporary_user_ids": [],
"guest_ids": [],

View File

@ -9,11 +9,12 @@
"custom_translations": [],
"enable_electronic_voting": true,
"reset_password_verbose_errors": true,
"name": "Test Organization",
"name": "Test Organisation",
"description": "",
"committee_ids": [1],
"resource_ids": [1]
"resource_ids": [1],
"organisation_tag_ids": [1]
}],
"user": [
{
@ -198,6 +199,15 @@
"organisation_id": 1
}
],
"organisation_tag": [
{
"id": 1,
"name": "Orga Tag 1",
"color": "#317796",
"tagged_ids": ["committee/1", "meeting/1"],
"organisation_id": 1
}
],
"committee": [
{
"id": 1,
@ -211,6 +221,7 @@
"manager_ids": [],
"forward_to_committee_ids": [],
"receive_forwardings_from_committee_ids": [],
"organisation_tag_ids": [1],
"organisation_id": 1
}],
"meeting": [
@ -379,6 +390,7 @@
"committee_id": 1,
"default_meeting_for_committee_id": 1,
"organisation_tag_ids": [1],
"present_user_ids": [1],
"temporary_user_ids": [],
"guest_ids": [3],

View File

@ -85,6 +85,9 @@ organisation:
resource_ids:
type: relation-list
to: resource/organisation_id
organisation_tag_ids:
type: relation-list
to: organisation_tag/organisation_id
user:
id: number
@ -258,6 +261,26 @@ resource:
type: relation
to: organisation/resource_ids
organisation_tag:
id: number
name:
type: string
required: True
color:
type: color
required: True
tagged_ids:
type: generic-relation-list
to:
collections:
- committee
- meeting
field: organisation_tag_ids
organisation_id:
type: relation
to: organisation/organisation_tag_ids
committee:
id: number
name:
@ -287,6 +310,9 @@ committee:
receive_forwardings_from_committee_ids:
type: relation-list
to: committee/forward_to_committee_ids
organisation_tag_ids:
type: relation-list
to: organisation_tag/tagged_ids
organisation_id:
type: relation
to: organisation/committee_ids
@ -832,6 +858,9 @@ meeting:
default_meeting_for_committee_id:
type: relation
to: committee/default_meeting_id
organisation_tag_ids:
type: relation-list
to: organisation_tag/tagged_ids
present_user_ids:
type: relation-list
to: user/is_present_in_meeting_ids