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

Merge pull request #2708 from emanuelschuetze/issue2626

Browse Source 
Improved wording for recommendation config (Fixes #2626)
This commit is contained in:
Emanuel Schütze 2016-12-01 11:29:29 +01:00 committed by GitHub
commit 9440842e6a
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/motions/config_variables.py
View File

@ -101,8 +101,8 @@ def get_config_variables():
yield ConfigVariable( yield ConfigVariable(
name='motions_recommendations_by', name='motions_recommendations_by',
default_value='', default_value='',
label='Name of recommendation committee', label='Name of recommender',
help_text='Use an empty value to disable the recommendation system.', help_text='Will be displayed as label before selected recommendation. Use an empty value to disable the recommendation system.',
weight=332, weight=332,
group='Motions', group='Motions',
subgroup='General', subgroup='General',

2
openslides/motions/static/js/motions/base.js
View File

@ -322,7 +322,7 @@ angular.module('OpenSlidesApp.motions', [
getRecommendationName: function () { getRecommendationName: function () {
var recommendation = ''; var recommendation = '';
var additionalName = ''; var additionalName = '';
if (this.recommendation) { if (Config.get('motions_recommendations_by').value !== '' && this.recommendation) {
recommendation = gettextCatalog.getString(this.recommendation.recommendation_label); recommendation = gettextCatalog.getString(this.recommendation.recommendation_label);
if (this.recommendation.show_recommendation_extension_field) { if (this.recommendation.show_recommendation_extension_field) {
// check motion comment fields for flag 'forRecommendation' // check motion comment fields for flag 'forRecommendation'

4
openslides/motions/static/js/motions/site.js
View File

@ -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('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('Stop submitting new motions by non-staff users');
gettext('Allow to disable versioning'); gettext('Allow to disable versioning');
gettext('Name of recommendation committee'); gettext('Name of recommender');
gettext('Use an empty value to disable the recommendation system.'); gettext('Will be displayed as label before selected recommendation. Use an empty value to disable the recommendation system.');
// subgroup Amendments // subgroup Amendments
gettext('Amendments'); gettext('Amendments');

6
openslides/motions/static/templates/motions/slide_motion.html
View File

@ -5,6 +5,12 @@
<h3 translate>State</h3> <h3 translate>State</h3>
{{ motion.getStateName() }} {{ motion.getStateName() }}
<!-- Recommendation -->
<div ng-if="motion.getRecommendationName() != ''">
<h3 translate>{{ config('motions_recommendations_by') }}</h3>
{{ motion.getRecommendationName() }}
</div>
<!-- Submitters --> <!-- Submitters -->
<h3 ng-if="motion.submitters.length > 0" translate>Submitters</h3> <h3 ng-if="motion.submitters.length > 0" translate>Submitters</h3>
<div ng-repeat="submitter in motion.submitters"> <div ng-repeat="submitter in motion.submitters">