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

Merge pull request #2718 from normanjaeckel/ApplyMotionText

Browse Source 
Changed config to apply motion text for new amendmend. Closed #2714.
This commit is contained in:
Emanuel Schütze 2016-12-02 08:51:46 +01:00 committed by GitHub
commit a1e33b99d4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/motions/config_variables.py
View File

@ -127,10 +127,11 @@ def get_config_variables():
subgroup='Amendments') subgroup='Amendments')
yield ConfigVariable( yield ConfigVariable(
name='motions_amendments_apply_title_text', name='motions_amendments_apply_text',
default_value=False, default_value=False,
input_type='boolean', input_type='boolean',
label='Apply title and text for new amendments', label='Apply text for new amendments',
help_text='The title of the motion is always applied.',
weight=342, weight=342,
group='Motions', group='Motions',
subgroup='Amendments') subgroup='Amendments')

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

@ -1370,10 +1370,10 @@ angular.module('OpenSlidesApp.motions.site', [
$scope.model.text = gettextCatalog.getString(Config.get('motions_preamble').value); $scope.model.text = gettextCatalog.getString(Config.get('motions_preamble').value);
// ... for amendments add parent_id // ... for amendments add parent_id
if (isAmendment) { if (isAmendment) {
if (Config.get('motions_amendments_apply_title_text').value) { if (Config.get('motions_amendments_apply_text').value) {
$scope.model.title = $scope.$parent.motion.getTitle();
$scope.model.text = $scope.$parent.motion.getText(); $scope.model.text = $scope.$parent.motion.getText();
} }
$scope.model.title = $scope.$parent.motion.getTitle();
$scope.model.parent_id = $scope.$parent.motion.id; $scope.model.parent_id = $scope.$parent.motion.id;
Motion.bindOne($scope.model.parent_id, $scope, 'parent'); Motion.bindOne($scope.model.parent_id, $scope, 'parent');
} }
@ -1932,7 +1932,8 @@ angular.module('OpenSlidesApp.motions.site', [
gettext('Amendments'); gettext('Amendments');
gettext('Activate amendments'); gettext('Activate amendments');
gettext('Prefix for the identifier for amendments'); gettext('Prefix for the identifier for amendments');
gettext('Apply title and text for new amendments'); gettext('Apply text for new amendments');
gettext('The title of the motion is always applied.');
// subgroup Suppoerters // subgroup Suppoerters
gettext('Supporters'); gettext('Supporters');