From 176444770452e2111bb4d5b3f7d762d89d9a0f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Sat, 16 Mar 2019 14:07:05 +0100
Subject: [PATCH] Bugfix in motion's diff-view: correct amendment diff

---
 .../motions/motion-repository.service.ts         | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/client/src/app/core/repositories/motions/motion-repository.service.ts b/client/src/app/core/repositories/motions/motion-repository.service.ts
index 70d0ee029..ba3ee54bc 100644
--- a/client/src/app/core/repositories/motions/motion-repository.service.ts
+++ b/client/src/app/core/repositories/motions/motion-repository.service.ts
@@ -679,26 +679,18 @@ export class MotionRepositoryService extends BaseAgendaContentObjectRepository<V
                     }
 
                     const origText = baseParagraphs[paraNo],
-                        paragraphLines = this.lineNumbering.getLineNumberRange(origText),
                         diff = this.diff.diff(origText, newText),
                         affectedLines = this.diff.detectAffectedLineRange(diff);
 
                     if (affectedLines === null) {
                         return null;
                     }
-
-                    let newTextLines = this.lineNumbering.insertLineNumbers(
-                        newText,
-                        lineLength,
-                        null,
-                        null,
-                        paragraphLines.from
-                    );
-                    newTextLines = this.diff.formatDiff(
-                        this.diff.extractRangeByLineNumbers(newTextLines, affectedLines.from, affectedLines.to)
+                    const affectedDiff = this.diff.formatDiff(
+                        this.diff.extractRangeByLineNumbers(diff, affectedLines.from, affectedLines.to)
                     );
+                    const affectedConsolidated = this.diff.diffHtmlToFinalText(affectedDiff);
 
-                    return new ViewMotionAmendedParagraph(amendment, paraNo, newTextLines, affectedLines);
+                    return new ViewMotionAmendedParagraph(amendment, paraNo, affectedConsolidated, affectedLines);
                 }
             )
             .filter((para: ViewMotionAmendedParagraph) => para !== null);