vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Set source after updating context

Browse source
This commit is contained in:
Suraj Shetty 2021-06-24 17:52:18 +05:30
parent 9e8aadf2f9
commit 57e41230b8
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/website/page_renderers/base_template_page.py
View file

@ -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()

7
frappe/website/page_renderers/template_page.py
View file

@ -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'''