From 57e41230b8f953c1f9870b3c91cbd608fbb3aa0d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 17:52:18 +0530 Subject: [PATCH] fix: Set source after updating context --- frappe/website/page_renderers/base_template_page.py | 1 + frappe/website/page_renderers/template_page.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/website/page_renderers/base_template_page.py b/frappe/website/page_renderers/base_template_page.py index 7802e6e7f6..34d51cd600 100644 --- a/frappe/website/page_renderers/base_template_page.py +++ b/frappe/website/page_renderers/base_template_page.py @@ -8,6 +8,7 @@ class BaseTemplatePage(BaseRenderer): def __init__(self, path, http_status_code=None): super().__init__(path=path, http_status_code=http_status_code) self.template_path = '' + self.source = '' def init_context(self): self.context = frappe._dict() diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 0abfa307d4..ddaf7cd519 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -69,8 +69,10 @@ class TemplatePage(BaseTemplatePage): self.init_context() self.set_pymodule() - self.setup_template() self.update_context() + self.setup_template() + self.load_colocated_files() + self.set_properties_from_source() self.post_process_context() html = self.render_template() @@ -125,7 +127,6 @@ class TemplatePage(BaseTemplatePage): def update_context(self): self.set_page_properties() self.set_properties_from_source() - self.load_colocated_files() self.context.build_version = frappe.utils.get_build_version() if self.pymodule_name: @@ -218,7 +219,7 @@ class TemplatePage(BaseTemplatePage): or '{% extends' in self.source)) def get_raw_template(self): - return frappe.get_jloader().get_source(frappe.get_jenv(), self.template_path)[0] + return frappe.get_jloader().get_source(frappe.get_jenv(), self.context.template)[0] def load_colocated_files(self): '''load co-located css/js files with the same name'''