ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2640 from emanuelschuetze/issue2639

Browse Source 
Fixed missplaced comma in pdf header (Fixed #2639)
This commit is contained in:
Norman Jäckel 2016-11-16 23:28:38 +01:00 committed by GitHub
commit f84c381f38
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/core/static/js/core/pdf.js
View File

@ -172,11 +172,11 @@ angular.module('OpenSlidesApp.core.pdf', [])
var line1 = [ var line1 = [
Config.get('general_event_name').value, Config.get('general_event_name').value,
Config.get('general_event_description').value Config.get('general_event_description').value
].join(' – '); ].filter(Boolean).join(' – ');
var line2 = [ var line2 = [
Config.get('general_event_location').value, Config.get('general_event_location').value,
Config.get('general_event_date').value Config.get('general_event_date').value
].join(', '); ].filter(Boolean).join(', ');
var text = [line1, line2].join('\n'); var text = [line1, line2].join('\n');
columns.push({ columns.push({
text: text, text: text,
@ -224,6 +224,7 @@ angular.module('OpenSlidesApp.core.pdf', [])
subtitle: { subtitle: {
fontSize: 9, fontSize: 9,
margin: [0,-20,0,20], margin: [0,-20,0,20],
color: 'grey'
}, },
preamble: { preamble: {
fontSize: 10, fontSize: 10,

7
openslides/motions/static/js/motions/pdf.js
View File

@ -215,11 +215,14 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
// motion reason heading // motion reason heading
var motionReason = function() { var motionReason = function() {
var reason = [{ var reason = [];
if (motion.getReason($scope.version)) {
reason.push({
text: gettextCatalog.getString('Reason'), text: gettextCatalog.getString('Reason'),
style: 'heading3' style: 'heading3'
}]; });
reason.push(converter.convertHTML(motion.getReason($scope.version), $scope)); reason.push(converter.convertHTML(motion.getReason($scope.version), $scope));
}
return reason; return reason;
}; };