From 7ad8a40764bafd3f8ab4174741adad6888c53c26 Mon Sep 17 00:00:00 2001
From: GabrielMeyer <meyergabriel@live.de>
Date: Thu, 12 Sep 2019 15:43:54 +0200
Subject: [PATCH] Fixes saving amendments with deleted paragraphs

---
 .../components/motion-detail/motion-detail.component.html   | 2 +-
 .../components/motion-detail/motion-detail.component.ts     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
index 02180cfe9..a47669a8e 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.html
@@ -725,7 +725,7 @@
                         {{ 'Line' | translate }} {{ paragraph.lineFrom }} - {{ paragraph.lineTo - 1 }}
                     </span>
                 </h3>
-                <editor [formControlName]="'text_' + paragraph.paragraphNo" [init]="tinyMceSettings" required></editor>
+                <editor [formControlName]="'text_' + paragraph.paragraphNo" [init]="tinyMceSettings"></editor>
                 <div
                     *ngIf="
                         contentForm.get('text_' + paragraph.paragraphNo).invalid &&
diff --git a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
index b8d6672f8..0e30721bb 100644
--- a/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
+++ b/client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
@@ -601,6 +601,10 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
             this.subscriptions.push(
                 this.repo.getViewModelObservable(motionId).subscribe(motion => {
                     if (motion) {
+                        if (motion.isParagraphBasedAmendment()) {
+                            this.contentForm.get('text').clearValidators();
+                            this.contentForm.get('text').updateValueAndValidity();
+                        }
                         const title = motion.getTitle();
                         super.setTitle(title);
                         this.motion = motion;
@@ -685,7 +689,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
 
                 paragraphsToChoose.forEach((paragraph: ParagraphToChoose, paragraphNo: number): void => {
                     if (formMotion.amendment_paragraphs[paragraphNo] !== null) {
-                        this.contentForm.addControl('text_' + paragraphNo, new FormControl('', Validators.required));
+                        this.contentForm.addControl('text_' + paragraphNo, new FormControl(''));
 
                         contentPatch.selected_paragraphs.push(paragraph);
                         contentPatch.text = formMotion.amendment_paragraphs[paragraphNo]; // Workaround as 'text' is required from the backend