From 4cd9d20435de6657277d2854f1a57eceb567753f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Mon, 24 Apr 2017 12:38:23 +0200
Subject: [PATCH] Improved motion catalog pdf for one/mutliple motions.

---
 CHANGELOG                                   | 15 +++++++------
 openslides/motions/static/js/motions/pdf.js | 24 ++++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c09242154..71c6fba32 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,12 +22,6 @@ Motions:
 - Bugfix: changing motion line length did not invalidate cache [#3202]
 - Bugfix: Added more distance in motion PDF for DEL-tags in new lines [#3211].
 
-Core:
-- No reload on logoff. OpenSlides is now a full single page
-  application [#3172].
-- Adding support for choosing image files as logos [#3184, #3207].
-- Fixing error when clearing empty chat [#3199].
-
 Users:
 - User without permission to see users can now see agenda item speakers,
   motion submitters and supporters, assignment candidates, mediafile
@@ -37,6 +31,15 @@ Users:
   e. g. for minimum password length [#3200].
 - Fixed compare of duplicated users while csv user import [#3201].
 
+Core:
+- No reload on logoff. OpenSlides is now a full single page
+  application [#3172].
+- Adding support for choosing image files as logos [#3184, #3207].
+- Fixing error when clearing empty chat [#3199].
+
+General:
+- Several bugfixes and minor improvements.
+
 
 Version 2.1.1 (2017-04-05)
 ==========================
diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js
index e11b196c9..7a0fd98e5 100644
--- a/openslides/motions/static/js/motions/pdf.js
+++ b/openslides/motions/static/js/motions/pdf.js
@@ -177,7 +177,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
             }
 
             // summary of change recommendations (for motion diff version only)
-            if (changeRecommendationMode == "diff") {
+            if (changeRecommendationMode == "diff" && changeRecommendations.length) {
                 var columnLineNumbers = [];
                 var columnChangeType = [];
                 angular.forEach(_.orderBy(changeRecommendations, ['line_from']), function(change) {
@@ -476,7 +476,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
     var createInstance = function(allMotions) {
 
         var title = PDFLayout.createTitle(
-                Config.translate(Config.get('motions_export_title').value)
+            Config.translate(Config.get('motions_export_title').value)
         );
 
         var createPreamble = function() {
@@ -580,14 +580,18 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
                     motionContent.push(PDFLayout.addPageBreak());
                 }
             });
-
-            return [
-                title,
-                createPreamble(),
-                createTOCategories(),
-                createTOContent(),
-                motionContent
-            ];
+            var content = [];
+            // print extra data (title, preamble, categories, toc) only for more than 1 motion
+            if (allMotions.length > 1) {
+                content.push(
+                    title,
+                    createPreamble(),
+                    createTOCategories(),
+                    createTOContent()
+                );
+            }
+            content.push(motionContent);
+            return content;
         };
         return {
             getContent: getContent