From f15cb4d42e4cdd54f37ad708e73b4c6c4ddff38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Sun, 16 Dec 2018 13:44:05 +0100
Subject: [PATCH 1/2] Bugfix: Creating amendments ./. empty supporters_id

---
 .../amendment-create-wizard.component.ts                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.ts b/client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.ts
index 3482cb1e0..1e82ba812 100644
--- a/client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.ts
+++ b/client/src/app/site/motions/components/amendment-create-wizard/amendment-create-wizard.component.ts
@@ -127,7 +127,7 @@ export class AmendmentCreateWizardComponent extends BaseViewComponent {
             state_id: [''],
             recommendation_id: [''],
             submitters_id: [],
-            supporters_id: [],
+            supporters_id: [[]],
             origin: ['']
         });
     }

From 058d87eb77a73de9b98e55c0c06b0a16dbd9eea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Sun, 16 Dec 2018 14:41:32 +0100
Subject: [PATCH 2/2] Bugfix: change detection for change recommendations

---
 .../motion-detail-diff.component.html                |  4 ++--
 .../motion-detail-diff.component.ts                  | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.html b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.html
index 16a8245c2..f409942c8 100644
--- a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.html
+++ b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.html
@@ -111,7 +111,7 @@
         <button
             type="button"
             mat-menu-item
-            [disabled]="hasCollissions(change)"
+            [disabled]="hasCollissions(change, changes)"
             (click)="setAcceptanceValue(change, 'accepted')"
         >
             <mat-icon>thumb_up</mat-icon>
@@ -121,7 +121,7 @@
         <button
             type="button"
             mat-menu-item
-            [disabled]="hasCollissions(change)"
+            [disabled]="hasCollissions(change, changes)"
             (click)="setAcceptanceValue(change, 'rejected')"
         >
             <mat-icon>thumb_down</mat-icon>
diff --git a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts
index 931dee776..5d995fb58 100644
--- a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts
+++ b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts
@@ -101,11 +101,13 @@ export class MotionDetailDiffComponent extends BaseViewComponent implements Afte
         return (
             changes.filter((otherChange: ViewUnifiedChange) => {
                 return (
-                    (otherChange.getChangeId() === change.getChangeId() &&
-                        (otherChange.getLineFrom() >= change.getLineFrom() &&
-                            otherChange.getLineFrom() < change.getLineTo())) ||
-                    (otherChange.getLineTo() > change.getLineFrom() && otherChange.getLineTo() <= change.getLineTo()) ||
-                    (otherChange.getLineFrom() < change.getLineFrom() && otherChange.getLineTo() > change.getLineTo())
+                    otherChange.getChangeId() !== change.getChangeId() &&
+                    ((otherChange.getLineFrom() >= change.getLineFrom() &&
+                        otherChange.getLineFrom() < change.getLineTo()) ||
+                        (otherChange.getLineTo() > change.getLineFrom() &&
+                            otherChange.getLineTo() <= change.getLineTo()) ||
+                        (otherChange.getLineFrom() < change.getLineFrom() &&
+                            otherChange.getLineTo() > change.getLineTo()))
                 );
             }).length > 0
         );