From 9e8aadf2f955dad58e8be2bc73528d3abfb6600f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 15:19:48 +0530 Subject: [PATCH] fix: Move context building to get_html --- frappe/website/doctype/blog_post/test_blog_post.py | 10 +++++----- frappe/website/page_renderers/document_page.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 0cef5b5f6f..a1e33812c0 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -98,14 +98,14 @@ class TestBlogPost(unittest.TestCase): clear_website_cache() # first response no-cache pages = frappe.get_all('Blog Post', fields=['name', 'route'], - filters={'published': 1, 'route': ('!=', '')}, limit =1) + filters={'published': 1, 'title': "_Test Blog Post"}, limit=1) - set_request(path=pages[0].route) - response = get_response() + route = pages[0].route + + response = get_response(route) self.assertIn(('X-From-Cache', 'False'), list(response.headers)) - # first response returned from cache - response = get_response() + response = get_response(route) self.assertIn(('X-From-Cache', 'True'), list(response.headers)) frappe.flags.force_website_cache = True diff --git a/frappe/website/page_renderers/document_page.py b/frappe/website/page_renderers/document_page.py index d20eccce8f..e2ce32897f 100644 --- a/frappe/website/page_renderers/document_page.py +++ b/frappe/website/page_renderers/document_page.py @@ -47,10 +47,6 @@ class DocumentPage(BaseTemplatePage): return False def render(self): - self.doc = frappe.get_doc(self.doctype, self.docname) - self.init_context() - self.update_context() - self.post_process_context() html = self.get_html() html = self.add_csrf_token(html) @@ -58,6 +54,10 @@ class DocumentPage(BaseTemplatePage): @cache_html def get_html(self): + self.doc = frappe.get_doc(self.doctype, self.docname) + self.init_context() + self.update_context() + self.post_process_context() html = frappe.get_template(self.template_path).render(self.context) return html