From 80f4cf8f2d71f320e49996f0ed58c0f8f0b176bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Wed, 30 Nov 2016 22:58:47 +0100
Subject: [PATCH] Improved wording for recommendation config (Fixes #2626)

- updated config label and helptext
- added recommendation also to motion slide
---
 openslides/motions/config_variables.py                      | 4 ++--
 openslides/motions/static/js/motions/base.js                | 2 +-
 openslides/motions/static/js/motions/site.js                | 4 ++--
 .../motions/static/templates/motions/slide_motion.html      | 6 ++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/openslides/motions/config_variables.py b/openslides/motions/config_variables.py
index 98b5571ec..8b1db73a9 100644
--- a/openslides/motions/config_variables.py
+++ b/openslides/motions/config_variables.py
@@ -101,8 +101,8 @@ def get_config_variables():
     yield ConfigVariable(
         name='motions_recommendations_by',
         default_value='',
-        label='Name of recommendation committee',
-        help_text='Use an empty value to disable the recommendation system.',
+        label='Name of recommender',
+        help_text='Will be displayed as label before selected recommendation. Use an empty value to disable the recommendation system.',
         weight=332,
         group='Motions',
         subgroup='General',
diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js
index 3457334a0..3e7f79e79 100644
--- a/openslides/motions/static/js/motions/base.js
+++ b/openslides/motions/static/js/motions/base.js
@@ -322,7 +322,7 @@ angular.module('OpenSlidesApp.motions', [
                 getRecommendationName: function () {
                     var recommendation = '';
                     var additionalName = '';
-                    if (this.recommendation) {
+                    if (Config.get('motions_recommendations_by').value !== '' && this.recommendation) {
                         recommendation = gettextCatalog.getString(this.recommendation.recommendation_label);
                         if (this.recommendation.show_recommendation_extension_field) {
                             // check motion comment fields for flag 'forRecommendation'
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index 39f233ff8..a5e1e1d38 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -1930,8 +1930,8 @@ angular.module('OpenSlidesApp.motions.site', [
         gettext('The maximum number of characters per line. Relevant when line numbering is enabled. Min: 40');
         gettext('Stop submitting new motions by non-staff users');
         gettext('Allow to disable versioning');
-        gettext('Name of recommendation committee');
-        gettext('Use an empty value to disable the recommendation system.');
+        gettext('Name of recommender');
+        gettext('Will be displayed as label before selected recommendation. Use an empty value to disable the recommendation system.');
 
         // subgroup Amendments
         gettext('Amendments');
diff --git a/openslides/motions/static/templates/motions/slide_motion.html b/openslides/motions/static/templates/motions/slide_motion.html
index 328a6d233..d0a1a1cbd 100644
--- a/openslides/motions/static/templates/motions/slide_motion.html
+++ b/openslides/motions/static/templates/motions/slide_motion.html
@@ -5,6 +5,12 @@
     <h3 translate>State</h3>
     {{ motion.getStateName() }}
 
+    <!-- Recommendation -->
+    <div ng-if="motion.getRecommendationName() != ''">
+      <h3 translate>{{ config('motions_recommendations_by') }}</h3>
+      {{ motion.getRecommendationName() }}
+    </div>
+
     <!-- Submitters -->
     <h3 ng-if="motion.submitters.length > 0" translate>Submitters</h3>
     <div ng-repeat="submitter in motion.submitters">