diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 83f9517..308211a 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -1082,7 +1082,7 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin): 'members/V32-1_Themenorientierte_Bildungsmassnahmen.pdf', context, save_only=True) - return merge_pdfs(title + 'LJP_Antrag', [v32_fp, fp]) + return merge_pdfs(title + '_LJP_Antrag', [v32_fp, fp]) return serve_pdf(fp) return self.render_seminar_report_options(request, memberlist, GenerateSeminarReportForm()) seminar_report.short_description = _('Generate seminar report') diff --git a/jdav_web/members/pdf.py b/jdav_web/members/pdf.py index 00a9877..05b2c2e 100644 --- a/jdav_web/members/pdf.py +++ b/jdav_web/members/pdf.py @@ -128,6 +128,8 @@ def merge_pdfs(name, filenames, save_only=False): merger.append(media_path(pdf)) filename = name + "_" + datetime.today().strftime("%d_%m_%Y") + filename = filename.replace(' ', '_').replace('&', '').replace('/', '_') + filename = unicodedata.normalize('NFKD', filename).encode('ASCII', 'ignore').decode() filename_pdf = filename + ".pdf" merger.write(media_path(filename_pdf)) merger.close()