diff --git a/edivorce/apps/core/templates/pdf/images_to_pdf.html b/edivorce/apps/core/templates/pdf/images_to_pdf.html index aaf9a707..8a6da5e5 100644 --- a/edivorce/apps/core/templates/pdf/images_to_pdf.html +++ b/edivorce/apps/core/templates/pdf/images_to_pdf.html @@ -29,7 +29,7 @@
{% for image in images %} - + {% if not forloop.last %}

{% endif %} diff --git a/edivorce/apps/core/views/pdf.py b/edivorce/apps/core/views/pdf.py index 2697df7b..509df62a 100644 --- a/edivorce/apps/core/views/pdf.py +++ b/edivorce/apps/core/views/pdf.py @@ -122,6 +122,7 @@ def images_to_pdf(request, doc_type, party_code): return response return __render_form(request, form_name, { + 'image_root': settings.WEASYPRINT_IMAGE_LOOPBACK, 'css_root': settings.WEASYPRINT_CSS_LOOPBACK, 'images': documents, 'form': form_name diff --git a/edivorce/settings/openshift.py b/edivorce/settings/openshift.py index 67464f83..417e6d38 100644 --- a/edivorce/settings/openshift.py +++ b/edivorce/settings/openshift.py @@ -88,8 +88,8 @@ STATIC_URL = PROXY_URL_PREFIX + '/static/' # Internal Urls (within the OpenShift project) WEASYPRINT_URL = 'http://weasyprint:5001' -WEASYPRINT_CSS_LOOPBACK = 'http://edivorce-django:8080' -WEASYPRINT_CSS_LOOPBACK += PROXY_URL_PREFIX +WEASYPRINT_IMAGE_LOOPBACK = 'http://edivorce-django:8080' +WEASYPRINT_CSS_LOOPBACK = WEASYPRINT_IMAGE_LOOPBACK + PROXY_URL_PREFIX # Basic authentication settings (meant for dev/test environments) BASICAUTH_ENABLED = os.getenv('BASICAUTH_ENABLED', '').lower() == 'true'