diff --git a/CHANGELOG b/CHANGELOG index 0255a1b4d..960152d9c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,6 +42,7 @@ Motions: - Added multiselect filter for motion comments [#3372]. - Added support for pinning personal notes to the window [#3360]. - Clear identifier on state reset [#3356]. +- New config options to hide reason and recommendation on projector [#3432]. Elections: - Added pagination for list view [#3393]. diff --git a/openslides/motions/config_variables.py b/openslides/motions/config_variables.py index ea34327b7..a26721265 100644 --- a/openslides/motions/config_variables.py +++ b/openslides/motions/config_variables.py @@ -80,20 +80,38 @@ def get_config_variables(): validators=(MinValueValidator(40),)) yield ConfigVariable( - name='motions_stop_submitting', + name='motions_disable_reason_on_projector', default_value=False, input_type='boolean', - label='Stop submitting new motions by non-staff users', + label='Hide reason on projector', weight=325, group='Motions', subgroup='General') + yield ConfigVariable( + name='motions_disable_recommendation_on_projector', + default_value=False, + input_type='boolean', + label='Hide recommendation on projector', + weight=327, + group='Motions', + subgroup='General') + yield ConfigVariable( name='motions_allow_disable_versioning', default_value=False, input_type='boolean', label='Allow to disable versioning', - weight=330, + weight=329, + group='Motions', + subgroup='General') + + yield ConfigVariable( + name='motions_stop_submitting', + default_value=False, + input_type='boolean', + label='Stop submitting new motions by non-staff users', + weight=331, group='Motions', subgroup='General') diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 947c4bcb1..84d08384c 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -2300,6 +2300,8 @@ angular.module('OpenSlidesApp.motions.site', [ gettext('None'); gettext('Line length'); gettext('The maximum number of characters per line. Relevant when line numbering is enabled. Min: 40'); + gettext('Hide reason on projector'); + gettext('Hide recommendation on projector'); gettext('Stop submitting new motions by non-staff users'); gettext('Allow to disable versioning'); gettext('Name of recommender'); diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html index 338f333b5..1ed176738 100644 --- a/openslides/motions/static/templates/motions/slide_motion.html +++ b/openslides/motions/static/templates/motions/slide_motion.html @@ -6,7 +6,7 @@ {{ motion.getStateName() }} -