diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js index 2073879b2..43b7fe983 100644 --- a/openslides/motions/static/js/motions/base.js +++ b/openslides/motions/static/js/motions/base.js @@ -271,7 +271,7 @@ angular.module('OpenSlidesApp.motions', [ 'motions/motionpoll': { localField: 'polls', foreignKey: 'motion_id', - }, + } }, hasOne: { 'motions/workflowstate': { diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 9da5fe61f..6287a04cf 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1084,6 +1084,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid // ... for amendments add parent_id if (isAmendment) { if (Config.get('motions_amendments_apply_title_text').value) { + $scope.model.title = $scope.$parent.motion.getTitle(); $scope.model.text = $scope.$parent.motion.getText(); } $scope.model.parent_id = $scope.$parent.motion.id; @@ -1665,6 +1666,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid gettext('Prefix for the identifier for amendments'); /// Prefix for the identifier for amendments gettext('A'); + gettext('Apply title and text for new amendments'); // subgroup Suppoerters gettext('Supporters'); diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html index 78f33e69f..6a770b05c 100644 --- a/openslides/motions/static/templates/motions/motion-detail.html +++ b/openslides/motions/static/templates/motions/motion-detail.html @@ -81,7 +81,7 @@ Unsupport motion - +

Amendments

diff --git a/openslides/motions/static/templates/motions/motion-form.html b/openslides/motions/static/templates/motions/motion-form.html index 82ecda623..eac2c5d64 100644 --- a/openslides/motions/static/templates/motions/motion-form.html +++ b/openslides/motions/static/templates/motions/motion-form.html @@ -1,6 +1,6 @@

Edit motion

New motion

-

New amendment of motion {{ parent.identifier || parent.getTitle() }}

+

New amendment of motion {{ parent.identifier || parent.getTitle() }}

{{ alert.msg }}