From 09aa2dea72ceb462743a52c39149845728a39937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <openslides@normanjaeckel.de>
Date: Thu, 25 Aug 2016 13:39:00 +0200
Subject: [PATCH] Review.

---
 openslides/motions/static/js/motions/base.js                   | 2 +-
 openslides/motions/static/js/motions/site.js                   | 2 ++
 openslides/motions/static/templates/motions/motion-detail.html | 2 +-
 openslides/motions/static/templates/motions/motion-form.html   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

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 @@
               <translate>Unsupport motion</translate>
             </button>
           </div>
-          <!-- -->
+          <!-- Amendments -->
           <div ng-if="config('motions_amendments_enabled')">
             <h3 translate>Amendments</h3>
             <div ng-repeat="amendment in 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 @@
 <h1 ng-if="model.id" translate>Edit motion</h1>
 <h1 ng-if="!model.id && !parent" translate>New motion</h1>
-<h1 ng-if="parent"><translate>New amendment of motion {{ parent.identifier || parent.getTitle() }}</translate></h1>
+<h1 ng-if="parent"><translate>New amendment of motion</translate> {{ parent.identifier || parent.getTitle() }}</h1>
 
 <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
   {{ alert.msg }}