From f9f9934722dda43ae21c8f69fc3c8acfce366b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Wed, 16 Nov 2016 11:31:56 +0100 Subject: [PATCH] Fixed missplaced comma in pdf header (Fixed #2639) --- openslides/core/static/js/core/pdf.js | 5 +++-- openslides/motions/static/js/motions/pdf.js | 13 ++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/openslides/core/static/js/core/pdf.js b/openslides/core/static/js/core/pdf.js index 3caa714b4..ea5aad6e1 100644 --- a/openslides/core/static/js/core/pdf.js +++ b/openslides/core/static/js/core/pdf.js @@ -172,11 +172,11 @@ angular.module('OpenSlidesApp.core.pdf', []) var line1 = [ Config.get('general_event_name').value, Config.get('general_event_description').value - ].join(' – '); + ].filter(Boolean).join(' – '); var line2 = [ Config.get('general_event_location').value, Config.get('general_event_date').value - ].join(', '); + ].filter(Boolean).join(', '); var text = [line1, line2].join('\n'); columns.push({ text: text, @@ -224,6 +224,7 @@ angular.module('OpenSlidesApp.core.pdf', []) subtitle: { fontSize: 9, margin: [0,-20,0,20], + color: 'grey' }, preamble: { fontSize: 10, diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js index dd76217a1..312010b3c 100644 --- a/openslides/motions/static/js/motions/pdf.js +++ b/openslides/motions/static/js/motions/pdf.js @@ -215,11 +215,14 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) // motion reason heading var motionReason = function() { - var reason = [{ - text: gettextCatalog.getString('Reason'), - style: 'heading3' - }]; - reason.push(converter.convertHTML(motion.getReason($scope.version), $scope)); + var reason = []; + if (motion.getReason($scope.version)) { + reason.push({ + text: gettextCatalog.getString('Reason'), + style: 'heading3' + }); + reason.push(converter.convertHTML(motion.getReason($scope.version), $scope)); + } return reason; };