Merge pull request #6107 from FinnStutzenstein/chatgroups

[WIP] Added chat groups
This commit is contained in:
Finn Stutzenstein 2021-06-07 11:55:17 +02:00 committed by GitHub
commit e56786d375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 88 additions and 7 deletions

View File

@ -10,8 +10,7 @@
"theme": "openslides-theme",
"custom_translations": "",
"reset_password_verbose_errors": false,
"enable_electronic_voting": true,
"enable_electronic_voting": false,
"committee_ids": [1],
"resource_ids": [],
@ -100,6 +99,7 @@
"jitsi_domain": "",
"jitsi_room_name": "",
"jitsi_room_password": "",
"enable_chat": false,
"url_name": "openslides_1",
"template_for_committee_id": null,
@ -247,6 +247,7 @@
"assignment_ids": [],
"assignment_candidate_ids": [],
"personal_note_ids": [],
"chat_group_ids": [],
"logo_$_id": [],
"font_$_id": [],
@ -319,6 +320,8 @@
"mediafile_inherited_access_group_ids": [],
"read_comment_section_ids": [],
"write_comment_section_ids": [],
"read_chat_group_ids": [],
"write_chat_group_ids": [],
"poll_ids": [],
"used_as_motion_poll_default_id": null,
"used_as_assignment_poll_default_id": null,
@ -337,6 +340,8 @@
"mediafile_inherited_access_group_ids": [],
"read_comment_section_ids": [],
"write_comment_section_ids": [],
"read_chat_group_ids": [],
"write_chat_group_ids": [],
"poll_ids": [],
"used_as_motion_poll_default_id": null,
"used_as_assignment_poll_default_id": null,
@ -369,6 +374,8 @@
"mediafile_inherited_access_group_ids": [],
"read_comment_section_ids": [],
"write_comment_section_ids": [],
"read_chat_group_ids": [],
"write_chat_group_ids": [],
"poll_ids": [],
"used_as_motion_poll_default_id": null,
"used_as_assignment_poll_default_id": null,
@ -398,6 +405,8 @@
"mediafile_inherited_access_group_ids": [],
"read_comment_section_ids": [],
"write_comment_section_ids": [],
"read_chat_group_ids": [],
"write_chat_group_ids": [],
"poll_ids": [],
"used_as_motion_poll_default_id": null,
"used_as_assignment_poll_default_id": null,
@ -429,6 +438,8 @@
"mediafile_inherited_access_group_ids": [],
"read_comment_section_ids": [],
"write_comment_section_ids": [],
"read_chat_group_ids": [],
"write_chat_group_ids": [],
"poll_ids": [],
"used_as_motion_poll_default_id": 1,
"used_as_assignment_poll_default_id": 1,
@ -646,5 +657,6 @@
"used_as_list_of_speaker_countdown_meeting_id": null,
"used_as_poll_countdown_meeting_id": 1,
"meeting_id": 1
}]
}],
"chat_group": []
}

View File

@ -2,6 +2,8 @@
"organization": [
{
"id": 1,
"name": "Test Organization",
"description": "",
"legal_notice": "<a href=\"http://www.openslides.org\">OpenSlides</a> is a free web based presentation and assembly system for visualizing and controlling agenda, motions and elections of an assembly.",
"privacy_policy": "",
"login_text": "Guten Morgen!",
@ -9,8 +11,6 @@
"custom_translations": [],
"enable_electronic_voting": true,
"reset_password_verbose_errors": true,
"name": "Test Organization",
"description": "",
"committee_ids": [1],
"resource_ids": [1],
@ -255,6 +255,7 @@
"jitsi_room_name": "",
"jitsi_domain": "",
"jitsi_room_password": "",
"enable_chat": true,
"projector_countdown_default_time": 60,
"projector_countdown_warning_time": 0,
@ -390,6 +391,7 @@
"assignment_ids": [1, 2],
"assignment_candidate_ids": [1, 2, 3, 4, 5],
"personal_note_ids": [1],
"chat_group_ids": [1, 2],
"logo_$_id": ["web_header"],
"logo_$web_header_id": 3,
@ -463,6 +465,8 @@
"mediafile_inherited_access_group_ids": [],
"read_comment_section_ids": [],
"write_comment_section_ids": [],
"read_chat_group_ids": [1],
"write_chat_group_ids": [1],
"poll_ids": [],
"used_as_motion_poll_default_id": null,
"used_as_assignment_poll_default_id": null,
@ -481,6 +485,8 @@
"mediafile_inherited_access_group_ids": [1, 3],
"read_comment_section_ids": [],
"write_comment_section_ids": [],
"read_chat_group_ids": [1, 2],
"write_chat_group_ids": [1, 2],
"poll_ids": [5],
"used_as_motion_poll_default_id": 1,
"used_as_assignment_poll_default_id": null,
@ -513,6 +519,8 @@
"mediafile_inherited_access_group_ids": [1, 3],
"read_comment_section_ids": [1],
"write_comment_section_ids": [1],
"read_chat_group_ids": [],
"write_chat_group_ids": [],
"poll_ids": [],
"used_as_motion_poll_default_id": 1,
"used_as_assignment_poll_default_id": 1,
@ -542,6 +550,8 @@
"mediafile_inherited_access_group_ids": [],
"read_comment_section_ids": [],
"write_comment_section_ids": [],
"read_chat_group_ids": [],
"write_chat_group_ids": [],
"poll_ids": [],
"used_as_motion_poll_default_id": null,
"used_as_assignment_poll_default_id": null,
@ -573,6 +583,8 @@
"mediafile_inherited_access_group_ids": [],
"read_comment_section_ids": [1],
"write_comment_section_ids": [1],
"read_chat_group_ids": [1, 2],
"write_chat_group_ids": [1, 2],
"poll_ids": [],
"used_as_motion_poll_default_id": null,
"used_as_assignment_poll_default_id": 1,
@ -2721,5 +2733,24 @@
"used_as_list_of_speaker_countdown_meeting_id": null,
"used_as_poll_countdown_meeting_id": 1,
"meeting_id": 1
}],
"chat_group": [
{
"id": 1,
"name": "General",
"weight": 1,
"read_group_ids": [1, 2, 5],
"write_group_ids": [1, 2, 5],
"meeting_id": 1
},
{
"id": 2,
"name": "Support",
"weight": 2,
"read_group_ids": [2, 5],
"write_group_ids": [2, 5],
"meeting_id": 1
}]
}

View File

@ -352,6 +352,8 @@ meeting:
type: string
jitsi_room_password:
type: string
enable_chat:
type: boolean
# System
url_name:
@ -847,6 +849,10 @@ meeting:
type: relation-list
to: personal_note/meeting_id
on_delete: CASCADE
chat_group_ids:
type: relation-list
to: chat_group/meeting_id
on_delete: CASCADE
# Logos and Fonts
logo_$_id:
@ -998,6 +1004,14 @@ group:
type: relation-list
to: motion_comment_section/write_group_ids
equal_fields: meeting_id
read_chat_group_ids:
type: relation-list
to: chat_group/read_group_ids
equal_fields: meeting_id
write_chat_group_ids:
type: relation-list
to: chat_group/write_group_ids
equal_fields: meeting_id
poll_ids:
type: relation-list
to: poll/entitled_group_ids
@ -2176,3 +2190,25 @@ projector_countdown:
meeting_id:
type: relation
to: meeting/projector_countdown_ids
chat_group:
id: number
name:
type: string
required: true
weight:
type: number
default: 10000
read_group_ids:
type: relation-list
to: group/read_chat_group_ids
equal_fields: meeting_id
write_group_ids:
type: relation-list
to: group/write_chat_group_ids
equal_fields: meeting_id
meeting_id:
type: relation
to: meeting/chat_group_ids
required: true

View File

@ -16,6 +16,8 @@ assignment:
can_see:
can_nominate_self:
can_see:
chat:
can_manage:
list_of_speakers:
can_manage:
can_see:

@ -1 +1 @@
Subproject commit 285d6135961b68c590dd800b7ef78fa9bf4c505e
Subproject commit d00dd3c5df681febcf19b2c7f7051048590e31db

@ -1 +1 @@
Subproject commit 8bc8547a8ad105e254d86ac395105e39168b7933
Subproject commit 4ca5486c5c73fb9453acb700393179f3182e6611