mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-18 05:51:26 +02:00
simpler fail if logo is not found
This commit is contained in:
@@ -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))
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user