From 41c0a321e5785c7ab5a5274e88bb0be3cfab4af3 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 6 Dec 2012 19:57:18 +0530 Subject: [PATCH] fix in blog comments and load_from_cache --- website/blog.py | 4 +--- website/web_cache.py | 11 ++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/website/blog.py b/website/blog.py index 8bb183d456..f422c93139 100644 --- a/website/blog.py +++ b/website/blog.py @@ -96,9 +96,7 @@ def add_comment(args=None): comment = webnotes.widgets.form.comments.add_comment(args) # since comments are embedded in the page, clear the web cache - website.web_cache.clear_cache(args.get('page_name'), - args.get('comment_doctype'), args.get('comment_docname')) - + website.web_cache.clear_cache(args.get('page_name')) comment['comment_date'] = webnotes.utils.global_date_format(comment['creation']) template_args = { 'comment_list': [comment], 'template': 'html/comment.html' } diff --git a/website/web_cache.py b/website/web_cache.py index 9146dd918e..76d773f557 100644 --- a/website/web_cache.py +++ b/website/web_cache.py @@ -48,18 +48,19 @@ def get_page_html(page_name, comments=''): return html def load_into_cache(page_name): + args = prepare_args(page_name) + html = build_html(args) + webnotes.cache().set_value("page:" + page_name, html) + return html + +def build_html(args): templates_path = os.path.join(os.path.dirname(conf.__file__), 'app', 'website', 'templates') - args = prepare_args(page_name) from jinja2 import Environment, FileSystemLoader jenv = Environment(loader = FileSystemLoader(templates_path)) html = jenv.get_template(args['template']).render(args) return html - - html = build_html() - webnotes.cache().set_value("page:" + page_name, html) - return html def prepare_args(page_name): if page_name == 'index':