summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/utils_secretary.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/ishtar_common/utils_secretary.py b/ishtar_common/utils_secretary.py
index e977d8eae..b66ae4760 100644
--- a/ishtar_common/utils_secretary.py
+++ b/ishtar_common/utils_secretary.py
@@ -36,17 +36,21 @@ def human_date_filter(value):
break
except locale.Error:
pass
- return value.strftime(settings.DATE_FORMAT).decode("utf-8")
+ return value.strftime(settings.DATE_FORMAT)
class IshtarSecretaryRenderer(Renderer):
def __init__(self, *args, **kwargs):
super(IshtarSecretaryRenderer, self).__init__(*args, **kwargs)
self.media_callback = self.ishtar_media_loader
+ self.media_path = settings.MEDIA_ROOT
self.environment.filters['human_date'] = human_date_filter
def ishtar_media_loader(self, media, *args, **kwargs):
- image_file, mime = self.fs_loader(media, *args, **kwargs)
+ res = self.fs_loader(media, *args, **kwargs)
+ if not res:
+ return
+ image_file, mime = res
if "width" in kwargs:
kwargs['frame_attrs']['svg:width'] = kwargs["width"]
if "height" in kwargs: