Merge pull request #2718 from normanjaeckel/ApplyMotionText
Changed config to apply motion text for new amendmend. Closed #2714.
This commit is contained in:
commit
a1e33b99d4
@ -127,10 +127,11 @@ def get_config_variables():
|
||||
subgroup='Amendments')
|
||||
|
||||
yield ConfigVariable(
|
||||
name='motions_amendments_apply_title_text',
|
||||
name='motions_amendments_apply_text',
|
||||
default_value=False,
|
||||
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,
|
||||
group='Motions',
|
||||
subgroup='Amendments')
|
||||
|
@ -1370,10 +1370,10 @@ angular.module('OpenSlidesApp.motions.site', [
|
||||
$scope.model.text = gettextCatalog.getString(Config.get('motions_preamble').value);
|
||||
// ... for amendments add parent_id
|
||||
if (isAmendment) {
|
||||
if (Config.get('motions_amendments_apply_title_text').value) {
|
||||
$scope.model.title = $scope.$parent.motion.getTitle();
|
||||
if (Config.get('motions_amendments_apply_text').value) {
|
||||
$scope.model.text = $scope.$parent.motion.getText();
|
||||
}
|
||||
$scope.model.title = $scope.$parent.motion.getTitle();
|
||||
$scope.model.parent_id = $scope.$parent.motion.id;
|
||||
Motion.bindOne($scope.model.parent_id, $scope, 'parent');
|
||||
}
|
||||
@ -1932,7 +1932,8 @@ angular.module('OpenSlidesApp.motions.site', [
|
||||
gettext('Amendments');
|
||||
gettext('Activate 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
|
||||
gettext('Supporters');
|
||||
|
Loading…
Reference in New Issue
Block a user