From cefdabc3d751dfe3dbd101ea36dc272095b85cb7 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@hotmail.de>
Date: Thu, 6 Apr 2017 15:49:42 +0200
Subject: [PATCH] fixes #3060, fixes #3186

---
 CHANGELOG                                               | 2 ++
 openslides/core/static/js/core/site.js                  | 8 ++++----
 openslides/core/static/templates/config-form-field.html | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 960a0a9d0..546c2af7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,8 @@ Version 2.2 (unreleased)
 
 Motions:
 - New export dialog.
+- Fixed issue when creating/deleting motion comment fields in the settings.
+
 
 Version 2.1.1 (2017-04-05)
 ==========================
diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index 8ef9bce61..ee9aad24b 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -994,16 +994,16 @@ angular.module('OpenSlidesApp.core.site', [
         };
 
         // For comments input
-        $scope.addComment = function (key, parent) {
+        $scope.addComment = function (configOption, parent) {
             parent.value.push({
                 name: gettextCatalog.getString('New'),
                 public: false,
             });
-            $scope.save(key, parent.value);
+            $scope.save(configOption, parent.value);
         };
-        $scope.removeComment = function (key, parent, index) {
+        $scope.removeComment = function (configOption, parent, index) {
             parent.value.splice(index, 1);
-            $scope.save(key, parent.value);
+            $scope.save(configOption, parent.value);
         };
 
         // For majority method
diff --git a/openslides/core/static/templates/config-form-field.html b/openslides/core/static/templates/config-form-field.html
index 9333b70d8..0bb9d778f 100644
--- a/openslides/core/static/templates/config-form-field.html
+++ b/openslides/core/static/templates/config-form-field.html
@@ -34,14 +34,14 @@
             {{ (entry.public ? 'Public' : 'Private') | translate }}
           </button>
           <button type="button" class="btn btn-default"
-            ng-click="removeComment(configOption.key, $parent, $index)">
+            ng-click="removeComment(configOption, $parent, $index)">
             <i class="fa fa-minus"></i>
             <translate>Remove</translate>
           </button>
         </span>
       </div>
       <div>
-        <button type="button" ng-click="addComment(configOption.key, $parent)"
+        <button type="button" ng-click="addComment(configOption, $parent)"
           class="btn btn-default btn-sm">
           <i class="fa fa-plus"></i>
           <translate>Add new comment field</translate>