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

Merge pull request #5924 from emanuelschuetze/agenda-config

Browse Source 
Fixed showSubtitle config. Reordered agenda config.
This commit is contained in:
Emanuel Schütze 2021-03-01 15:37:17 +01:00 committed by GitHub
commit 7dcc0ad42a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/core/translate/marked-translations.ts
View File

@ -110,7 +110,7 @@ _('Arabic');
_('Roman');
_('Begin of event');
_('Input format: DD.MM.YYYY HH:MM');
_('Show subtitles in the agenda');
_('Show motion submitters in the agenda');
_('Hide internal items when projecting subitems');
_('Number of the next speakers to be shown on the projector');
_('Enter number of the next shown speakers. Choose -1 to show all next speakers.');

2
client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
View File

@ -47,7 +47,7 @@
</div>
<!-- Subtitle line -->
<div class="subtitle ellipsis-overflow">
<div class="subtitle ellipsis-overflow" *ngIf="showSubtitle">
{{ item.getSubtitle() }}
</div>

20
server/openslides/agenda/config_variables.py
View File

@ -20,15 +20,7 @@ def get_config_variables():
help_text="Input format: DD.MM.YYYY HH:MM",
weight=200,
group="Agenda",
)
yield ConfigVariable(
name="agenda_show_subtitle",
default_value=False,
input_type="boolean",
label="Show subtitles in the agenda",
weight=201,
group="Agenda",
hidden=True,
)
# Numbering
@ -111,6 +103,16 @@ def get_config_variables():
subgroup="Visibility",
)
yield ConfigVariable(
name="agenda_show_subtitle",
default_value=True,
input_type="boolean",
label="Show motion submitters in the agenda",
weight=213,
group="Agenda",
subgroup="Visibility",
)
# List of speakers
yield ConfigVariable(

4
server/tests/integration/core/test_viewset.py
View File

@ -361,7 +361,7 @@ class ConfigViewSet(TestCase):
def test_reset_group(self):
config["general_event_name"] = "test_name_of20w2fj20clqwcm2pij" # Group General
config["agenda_show_subtitle"] = True # Group Agenda
config["agenda_show_subtitle"] = False # Group Agenda
config[
"motions_preamble"
] = "test_preamble_2390jvwohjwo1oigefoq" # Group motions
@ -370,7 +370,7 @@ class ConfigViewSet(TestCase):
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(config["general_event_name"], "OpenSlides")
self.assertEqual(config["agenda_show_subtitle"], False)
self.assertEqual(config["agenda_show_subtitle"], True)
self.assertEqual(
config["motions_preamble"], "test_preamble_2390jvwohjwo1oigefoq"
)