From faf718d7a0cf5a665cbbc8515cdd2b30e1439f5a Mon Sep 17 00:00:00 2001 From: Spitap Date: Sat, 18 Feb 2023 11:22:27 +0100 Subject: [PATCH] simpler fail if logo is not found --- modoboa/pdfcredentials/documents.py | 4 +++- modoboa/pdfcredentials/lib.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modoboa/pdfcredentials/documents.py b/modoboa/pdfcredentials/documents.py index 21399a6d6..adaf9b572 100644 --- a/modoboa/pdfcredentials/documents.py +++ b/modoboa/pdfcredentials/documents.py @@ -62,7 +62,9 @@ def credentials(account, password): buff = BytesIO() doc = SimpleDocTemplate(buff, pagesize=A4) story = [] - story.append(resized_image(lib.get_document_logo(), 8*cm)) + logo = lib.get_document_logo() + if logo is not None: + story.append(resized_image(logo, 8*cm)) story.append(Spacer(1, 1 * cm)) story.append(Paragraph(conf["title"], styles["Title"])) story.append(Spacer(1, 1 * cm)) diff --git a/modoboa/pdfcredentials/lib.py b/modoboa/pdfcredentials/lib.py index 2d9785bbf..937dd6731 100644 --- a/modoboa/pdfcredentials/lib.py +++ b/modoboa/pdfcredentials/lib.py @@ -96,6 +96,9 @@ def get_document_logo(): logo = settings.MODOBOA_CUSTOM_LOGO logo = os.path.join(settings.MEDIA_ROOT, os.path.basename(logo)) except AttributeError: - logo = os.path.join(settings.STATIC_ROOT, "css/modoboa.png") + try: + logo = os.path.join(settings.STATIC_ROOT, "css/modoboa.png") + except OSError: + return None finally: return logo