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

Merge pull request #3252 from FinnStutzenstein/PdfZipFilenames 

Fixing PDF filenames on zip export if no identifier is given
This commit is contained in:
Emanuel Schütze 2017-05-16 20:58:28 +02:00 committed by GitHub
parent d5b9a5c590 d1f0b69d35
commit 6eec735c8e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,9 +724,23 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
var self = this;
var pdfs = {};
var usedFilenames = [];
var pdfPromises = _.map(motions, function (motion) {
var identifier = motion.identifier ? '-' + motion.identifier : '';
var filename = gettextCatalog.getString('Motion') + identifier + '.pdf';
var filename = gettextCatalog.getString('Motion') + identifier;
// If the filename is already in use, try to append a number to it (like '(2)')
if (_.includes(usedFilenames, filename)) {
var i = 1;
var filenameWithNumber = filename;
while(_.includes(usedFilenames, filenameWithNumber)) {
filenameWithNumber = filename + ' (' + i + ')';
i++;
}
filename = filenameWithNumber;
}
usedFilenames.push(filename);
filename += '.pdf';
return $q(function (resolve, reject) {
// get documentProvider for every motion.