From a12440ed2c3055aedf85efe46e91b42c9c5d45e4 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@hotmail.de>
Date: Fri, 11 Aug 2017 12:37:19 +0200
Subject: [PATCH] Exclude special comments in comment field settings; fixing
 the inline editiing

---
 openslides/core/static/js/core/site.js                   | 9 +++++++++
 openslides/core/static/templates/config-form-field.html  | 2 +-
 openslides/motions/static/js/motions/motion-services.js  | 2 +-
 openslides/motions/static/js/motions/site.js             | 4 ++++
 .../static/templates/motions/motion-detail/comments.html | 7 +++----
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index e369aa5ec..dcbbc869d 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -741,6 +741,15 @@ angular.module('OpenSlidesApp.core.site', [
     }
 ])
 
+.filter('excludeSpecialComments', function () {
+    return function (comments) {
+        return _.filter(comments, function (comment) {
+            var specialComment = comment.forState || comment.forRecommendation;
+            return !specialComment;
+        });
+    };
+})
+
 // angular formly config options
 .run([
     'formlyConfig',
diff --git a/openslides/core/static/templates/config-form-field.html b/openslides/core/static/templates/config-form-field.html
index 0bb9d778f..67a8cc8e4 100644
--- a/openslides/core/static/templates/config-form-field.html
+++ b/openslides/core/static/templates/config-form-field.html
@@ -20,7 +20,7 @@
 
     <!-- comments -->
     <div class="input-comments" ng-if="type === 'comments'">
-      <div ng-repeat="entry in $parent.value" class="input-group">
+      <div ng-repeat="entry in $parent.value | excludeSpecialComments" class="input-group">
         <input ng-model="entry.name"
                ng-model-options="{debounce: 1000}"
                ng-change="save(configOption, $parent.value)"
diff --git a/openslides/motions/static/js/motions/motion-services.js b/openslides/motions/static/js/motions/motion-services.js
index 3446a5e54..5f4442ce6 100644
--- a/openslides/motions/static/js/motions/motion-services.js
+++ b/openslides/motions/static/js/motions/motion-services.js
@@ -134,7 +134,7 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
             var commentsInlineEditing = {
                 editors: []
             };
-            _.forEach($scope.commentsFields, function (field) {
+            _.forEach($scope.commentsFieldsNoSpecialComments, function (field) {
                 var inlineEditing = MotionInlineEditing.createInstance($scope, motion,
                     'view-original-comment-inline-editor-' + field.name, false,
                     function (obj) {
diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index 08896390c..23e8edb63 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -1268,6 +1268,10 @@ angular.module('OpenSlidesApp.motions.site', [
             }
         };
         $scope.commentsFields = Config.get('motions_comments').value;
+        $scope.commentsFieldsNoSpecialComments = _.filter($scope.commentsFields, function (field) {
+            var specialComment = field.forState || field.forRecommendation;
+            return !specialComment;
+        });
         $scope.commentFieldForState = MotionComment.getFieldNameForFlag('forState');
         $scope.commentFieldForRecommendation = MotionComment.getFieldNameForFlag('forRecommendation');
         $scope.version = motion.active_version;
diff --git a/openslides/motions/static/templates/motions/motion-detail/comments.html b/openslides/motions/static/templates/motions/motion-detail/comments.html
index e44a4f095..55e227931 100644
--- a/openslides/motions/static/templates/motions/motion-detail/comments.html
+++ b/openslides/motions/static/templates/motions/motion-detail/comments.html
@@ -1,4 +1,4 @@
-<div class="details" ng-if="isAllowedToSeeCommentField()">
+<div class="details" ng-if="isAllowedToSeeCommentField() && commentsFieldsNoSpecialComments.length">
   <div class="row">
     <!-- inline editing toolbar -->
     <div class="motion-toolbar">
@@ -25,9 +25,8 @@
     </div>
     <!-- comment fields -->
     <div class="col-sm-12">
-      <div ng-repeat="field in commentsFields">
-        <div ng-if="(field.public && !field.forState && !field.forRecommendation) ||
-            (operator.hasPerms('motions.can_see_and_manage_comments') && !field.forState && !field.forRecommendation)">
+      <div ng-repeat="field in commentsFieldsNoSpecialComments">
+        <div ng-if="operator.hasPerms('motions.can_see_and_manage_comments') && !field.forState && !field.forRecommendation">
           <h4>
             {{ field.name }}
             <span ng-if="!field.public" class="label label-warning" translate>internal</span>