From 35cd49e4fe73adfea3dc4163227e3a702b4d3140 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@hotmail.de>
Date: Thu, 14 Feb 2019 12:52:39 +0100
Subject: [PATCH] read crmode from the projector element

---
 client/src/app/site/motions/services/motion-pdf.service.ts    | 3 +--
 .../slides/motions/motion/motions-motion-slide.component.ts   | 3 ++-
 openslides/motions/projector.py                               | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/src/app/site/motions/services/motion-pdf.service.ts b/client/src/app/site/motions/services/motion-pdf.service.ts
index b39d388a3..5c19ed9a2 100644
--- a/client/src/app/site/motions/services/motion-pdf.service.ts
+++ b/client/src/app/site/motions/services/motion-pdf.service.ts
@@ -4,15 +4,14 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service';
 import { ConfigService } from 'app/core/ui-services/config.service';
-import { ViewUnifiedChange } from '../../../shared/models/motions/view-unified-change';
 import { HtmlToPdfService } from 'app/core/ui-services/html-to-pdf.service';
 import { MotionPollService, CalculablePollKey } from './motion-poll.service';
 import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service';
 import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service';
 import { ViewMotion, LineNumberingMode, ChangeRecoMode } from '../models/view-motion';
-import { ViewUnifiedChange } from '../models/view-unified-change';
 import { LinenumberingService } from 'app/core/ui-services/linenumbering.service';
 import { MotionCommentSectionRepositoryService } from 'app/core/repositories/motions/motion-comment-section-repository.service';
+import { ViewUnifiedChange } from 'app/shared/models/motions/view-unified-change';
 
 /**
  * Type declaring which strings are valid options for metainfos to be exported into a pdf
diff --git a/client/src/app/slides/motions/motion/motions-motion-slide.component.ts b/client/src/app/slides/motions/motion/motions-motion-slide.component.ts
index d5e163b18..6dbd5fc3f 100644
--- a/client/src/app/slides/motions/motion/motions-motion-slide.component.ts
+++ b/client/src/app/slides/motions/motion/motions-motion-slide.component.ts
@@ -54,8 +54,9 @@ export class MotionsMotionSlideComponent extends BaseSlideComponent<MotionsMotio
         this._data = value;
         this.lnMode = value.data.line_numbering_mode;
         this.lineLength = value.data.line_length;
-        this.crMode = value.data.change_recommendation_mode;
         this.preamble = value.data.preamble;
+        this.crMode = value.element.mode || 'original';
+        console.log(this.crMode);
 
         this.recalcUnifiedChanges();
     }
diff --git a/openslides/motions/projector.py b/openslides/motions/projector.py
index 8184fe2fe..e67cb1923 100644
--- a/openslides/motions/projector.py
+++ b/openslides/motions/projector.py
@@ -109,7 +109,7 @@ def motion_slide(all_data: AllData, element: Dict[str, Any]) -> Dict[str, Any]:
     * change_recommendations
     * submitter
     """
-    mode = element.get("mode")
+    mode = element.get("mode", "original")
     motion_id = element.get("id")
 
     if motion_id is None:
@@ -123,7 +123,6 @@ def motion_slide(all_data: AllData, element: Dict[str, Any]) -> Dict[str, Any]:
     show_meta_box = not get_config(all_data, "motions_disable_sidebox_on_projector")
     line_length = get_config(all_data, "motions_line_length")
     line_numbering_mode = get_config(all_data, "motions_default_line_numbering")
-    change_recommendation_mode = get_config(all_data, "motions_recommendation_text_mode")
     motions_preamble = get_config(all_data, "motions_preamble")
 
     if motion["statute_paragraph_id"]:
@@ -155,7 +154,6 @@ def motion_slide(all_data: AllData, element: Dict[str, Any]) -> Dict[str, Any]:
         "show_meta_box": show_meta_box,
         "change_recommendations": change_recommendations,
         "amendments": amendments,
-        "change_recommendation_mode": change_recommendation_mode,
         "line_length": line_length,
         "line_numbering_mode": line_numbering_mode,
     }