Merge pull request #3432 from emanuelschuetze/additionalOptions

Added new motion configs to hide reason/recommendation on projector.
This commit is contained in:
Emanuel Schütze 2017-10-05 13:29:12 +02:00 committed by GitHub
commit 886d76ff06
4 changed files with 29 additions and 6 deletions

View File

@ -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].

View File

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

View File

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

View File

@ -6,7 +6,7 @@
{{ motion.getStateName() }}
<!-- Recommendation -->
<div ng-if="motion.getRecommendationName() != ''">
<div ng-if="motion.getRecommendationName() != '' && !config('motions_disable_recommendation_on_projector')">
<h3>{{ config('motions_recommendations_by') }}</h3>
{{ motion.getRecommendationName() }}
</div>
@ -119,6 +119,8 @@
</div>
<!-- Reason -->
<h3 ng-if="motion.getReason()" translate>Reason</h3>
<div ng-bind-html="motion.getReason() | trusted"></div>
<div ng-if="motion.getReason() && !config('motions_disable_reason_on_projector')">
<h3 translate>Reason</h3>
<div ng-bind-html="motion.getReason() | trusted"></div>
</div>
</div>