From 4e6f0850c4ecd4359129261f6dda833e9a76f2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Mon, 1 Mar 2021 10:52:42 +0100
Subject: [PATCH] Fixed showSubtitle config. Reordered agenda config.

---
 .../app/core/translate/marked-translations.ts |  2 +-
 .../agenda-list/agenda-list.component.html    |  2 +-
 server/openslides/agenda/config_variables.py  | 20 ++++++++++---------
 server/tests/integration/core/test_viewset.py |  4 ++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/client/src/app/core/translate/marked-translations.ts b/client/src/app/core/translate/marked-translations.ts
index 2937029f2..3fc6702e8 100644
--- a/client/src/app/core/translate/marked-translations.ts
+++ b/client/src/app/core/translate/marked-translations.ts
@@ -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.');
diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
index a8a2b96e8..50ded374b 100644
--- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
+++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
@@ -47,7 +47,7 @@
             </div>
 
             <!-- Subtitle line -->
-            <div class="subtitle ellipsis-overflow">
+            <div class="subtitle ellipsis-overflow" *ngIf="showSubtitle">
                 {{ item.getSubtitle() }}
             </div>
 
diff --git a/server/openslides/agenda/config_variables.py b/server/openslides/agenda/config_variables.py
index e7e900482..340efb47d 100644
--- a/server/openslides/agenda/config_variables.py
+++ b/server/openslides/agenda/config_variables.py
@@ -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(
diff --git a/server/tests/integration/core/test_viewset.py b/server/tests/integration/core/test_viewset.py
index 500066713..4cb4a0f50 100644
--- a/server/tests/integration/core/test_viewset.py
+++ b/server/tests/integration/core/test_viewset.py
@@ -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"
         )