diff options
| -rw-r--r-- | ishtar_common/views.py | 6 | ||||
| -rw-r--r-- | ishtar_common/wizards.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 9a6fdbdcd..bb39c7015 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1267,7 +1267,7 @@ def show_item(model, name, extra_dct=None): if doc_type == "odt" and settings.ODT_TEMPLATE: tpl = loader.get_template('ishtar/sheet_%s.html' % name) context_instance['output'] = 'ODT' - content = tpl.render(context_instance) + content = tpl.render(context_instance, request) try: tidy_options = {'output-xhtml': 1, 'indent': 1, 'tidy-mark': 0, 'doctype': 'auto', @@ -1307,7 +1307,7 @@ def show_item(model, name, extra_dct=None): elif doc_type == 'pdf': tpl = loader.get_template('ishtar/sheet_%s_pdf.html' % name) context_instance['output'] = 'PDF' - content = tpl.render(context_instance) + content = tpl.render(context_instance, request) result = StringIO.StringIO() html = content.encode('utf-8') html = html.replace("<table", "<pdf:nextpage/><table repeat='1'") @@ -1322,7 +1322,7 @@ def show_item(model, name, extra_dct=None): return HttpResponse(content, content_type="application/xhtml") else: tpl = loader.get_template('ishtar/sheet_%s_window.html' % name) - content = tpl.render(context_instance) + content = tpl.render(context_instance, request) return HttpResponse(content, content_type="application/xhtml") return func diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index 4a7181e9f..ca18d6697 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -1421,7 +1421,7 @@ class AccountWizard(Wizard): 'site': site and site.domain or "" } t = loader.get_template('account_activation_email.txt') - msg = t.render(context) + msg = t.render(context, self.request) subject = _(u"[%(app_name)s] Account creation/modification") % { "app_name": app_name} send_mail(subject, msg, settings.ADMINS[0][1], |