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

Merge pull request #5158 from emanuelschuetze/change-metabox-config

Browse Source 
Rename config option to show meta box below title on projector.
This commit is contained in:
Emanuel Schütze 2019-12-09 16:45:59 +01:00 committed by GitHub
commit a85858f6b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 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

@ -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');

20
openslides/motions/config_variables.py
View File

@ -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",
)

6
tests/unit/motions/test_projector.py
View File

@ -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": "<p>Some preamble text</p>"},
"is_child": False,
"show_meta_box": True,
"show_meta_box": False,
"show_referring_motions": True,
"reason": "",
"submitters": ["Administrator"],