From 19a5e7f2f8ee5a410c6cf40b58c4d62e082bf4e5 Mon Sep 17 00:00:00 2001 From: Christian Merten Date: Tue, 24 Jan 2023 22:59:36 +0100 Subject: [PATCH] pdf generation: replace / in filename with underscore --- jdav_web/members/admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 01529c6..883afc8 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -294,7 +294,7 @@ class MemberNoteListAdmin(admin.ModelAdmin): for memberlist in queryset: # unique filename filename = memberlist.title + "_notes_" + datetime.today().strftime("%d_%m_%Y") - filename = filename.replace(' ', '_').replace('&', '') + filename = filename.replace(' ', '_').replace('&', '').replace('/', '_') # drop umlauts, accents etc. filename = unicodedata.normalize('NFKD', filename).\ encode('ASCII', 'ignore').decode() @@ -436,7 +436,7 @@ class FreizeitAdmin(admin.ModelAdmin): for memberlist in queryset: # create a unique filename filename = memberlist.name + "_" + datetime.today().strftime("%d_%m_%Y") - filename = filename.replace(' ', '_').replace('&', '') + filename = filename.replace(' ', '_').replace('&', '').replace('/', '_') # drop umlauts, accents etc. filename = unicodedata.normalize('NFKD', filename).\ encode('ASCII', 'ignore').decode() @@ -560,7 +560,7 @@ class FreizeitAdmin(admin.ModelAdmin): for memberlist in queryset: # unique filename filename = memberlist.name + "_note_" + datetime.today().strftime("%d_%m_%Y") - filename = filename.replace(' ', '_').replace('&', '') + filename = filename.replace(' ', '_').replace('&', '').replace('/', '_') # drop umlauts, accents etc. filename = unicodedata.normalize('NFKD', filename).\ encode('ASCII', 'ignore').decode() @@ -671,7 +671,7 @@ class FreizeitAdmin(admin.ModelAdmin): for memberlist in queryset: # create a unique filename filename = memberlist.name + "_ljp_" + datetime.today().strftime("%d_%m_%Y") - filename = filename.replace(' ', '_').replace('&', '') + filename = filename.replace(' ', '_').replace('&', '').replace('/', '_') # drop umlauts, accents etc. filename = unicodedata.normalize('NFKD', filename).\ encode('ASCII', 'ignore').decode()