From 17cbbc926a186d517d9683c33b3265b6b4b578f0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 4 Nov 2020 16:00:20 +0100 Subject: Labels generation: fix missing images in templates --- archaeological_operations/tests.py | 5 ++++- ishtar_common/models.py | 2 +- ishtar_common/templates/blocks/DataTables-content.html | 2 +- ishtar_common/utils_secretary.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 9cb715a6f..bb8c02c78 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -2449,7 +2449,10 @@ class LabelTest(TestCase, OperationInitTest): z = zipfile.ZipFile(f) self.assertIsNone(z.testzip()) content = z.open('content.xml') - self.assertIn(b'1789', content.read()) + full_content = content.read() + self.assertIn(b'1789', full_content) + # jpe file are added for missing pictures / must be filtered + self.assertNotIn(b'.jpe"', full_content) finally: if content: content.close() diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 0e68bf7dd..94d8744e5 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -3665,7 +3665,7 @@ class DocumentTemplate(models.Model): break obj = objects[c_idx] values["items"].append(obj.get_values()) - engine = SecretaryRenderer() + engine = IshtarSecretaryRenderer() try: result = engine.render(self.template, **values) except TemplateSyntaxError as e: diff --git a/ishtar_common/templates/blocks/DataTables-content.html b/ishtar_common/templates/blocks/DataTables-content.html index 82da411e1..814e10c18 100644 --- a/ishtar_common/templates/blocks/DataTables-content.html +++ b/ishtar_common/templates/blocks/DataTables-content.html @@ -44,7 +44,7 @@