From 9e81e6145fb87bd3b35b1a494e53b8e2295765e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Mon, 9 Dec 2019 16:03:06 +0100 Subject: [PATCH] Rename config option to show meta box below title on projector. --- .../app/core/translate/marked-translations.ts | 2 +- openslides/motions/config_variables.py | 20 +++++++++---------- tests/unit/motions/test_projector.py | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client/src/app/core/translate/marked-translations.ts b/client/src/app/core/translate/marked-translations.ts index 93d658289..02f3d3de6 100644 --- a/client/src/app/core/translate/marked-translations.ts +++ b/client/src/app/core/translate/marked-translations.ts @@ -113,9 +113,9 @@ _('The maximum number of characters per line. Relevant when line numbering is en _('Reason required for creating new motion'); _('Hide motion text on projector'); _('Hide reason on projector'); -_('Hide meta information box on projector'); _('Hide recommendation on projector'); _('Hide referring motions'); +_('Show meta information box below the title on projector'); _('Show the sequential number for a motion'); _('In motion list, motion detail and PDF.'); _('Stop submitting new motions by non-staff users'); diff --git a/openslides/motions/config_variables.py b/openslides/motions/config_variables.py index 77095cf6c..224e9ff0c 100644 --- a/openslides/motions/config_variables.py +++ b/openslides/motions/config_variables.py @@ -107,21 +107,12 @@ def get_config_variables(): group="Motions", ) - yield ConfigVariable( - name="motions_disable_sidebox_on_projector", - default_value=False, - input_type="boolean", - label="Hide meta information box on projector", - weight=327, - group="Motions", - ) - yield ConfigVariable( name="motions_disable_recommendation_on_projector", default_value=False, input_type="boolean", label="Hide recommendation on projector", - weight=328, + weight=327, group="Motions", ) @@ -130,6 +121,15 @@ def get_config_variables(): default_value=False, input_type="boolean", label="Hide referring motions", + weight=328, + group="Motions", + ) + + yield ConfigVariable( + name="motions_disable_sidebox_on_projector", + default_value=True, + input_type="boolean", + label="Show meta information box below the title on projector", weight=329, group="Motions", ) diff --git a/tests/unit/motions/test_projector.py b/tests/unit/motions/test_projector.py index 883740829..c829070d0 100644 --- a/tests/unit/motions/test_projector.py +++ b/tests/unit/motions/test_projector.py @@ -292,7 +292,7 @@ async def test_motion_slide(all_data): "base_motion": None, "base_statute": None, "is_child": False, - "show_meta_box": True, + "show_meta_box": False, "show_referring_motions": True, "reason": "", "submitters": ["Administrator"], @@ -319,7 +319,7 @@ async def test_amendment_slide(all_data): "base_motion": {"identifier": "4", "text": "motion text", "title": "12345"}, "base_statute": None, "is_child": True, - "show_meta_box": True, + "show_meta_box": False, "show_referring_motions": True, "reason": "", "submitters": ["Administrator"], @@ -346,7 +346,7 @@ async def test_statute_amendment_slide(all_data): "base_motion": None, "base_statute": {"title": "ยง1 Preamble", "text": "

Some preamble text

"}, "is_child": False, - "show_meta_box": True, + "show_meta_box": False, "show_referring_motions": True, "reason": "", "submitters": ["Administrator"],