diff --git a/erpnext/website/blog.py b/erpnext/website/blog.py index 8c367fefd0..d8f0fd97b7 100644 --- a/erpnext/website/blog.py +++ b/erpnext/website/blog.py @@ -104,7 +104,7 @@ def add_comment(args=None): return comment_html -def get_content(blog_page_name): +def get_blog_content(blog_page_name): import website.web_cache content = website.web_cache.get_html(blog_page_name) diff --git a/erpnext/website/templates/html/blog_page.html b/erpnext/website/templates/html/blog_page.html index c07706af4b..e9c1646174 100644 --- a/erpnext/website/templates/html/blog_page.html +++ b/erpnext/website/templates/html/blog_page.html @@ -20,6 +20,8 @@
By {{ full_name }} on {{ updated }}

{{ content_html }} + +

Comments


@@ -32,10 +34,9 @@ {% endif %} {% include 'html/comment.html' %} + +
- - -
diff --git a/erpnext/website/templates/js/blog.js b/erpnext/website/templates/js/blog.js index 3ccc7d4eb1..78dd3b774f 100644 --- a/erpnext/website/templates/js/blog.js +++ b/erpnext/website/templates/js/blog.js @@ -26,7 +26,7 @@ wn.pages['{{ name }}'].onload = function(wrapper) { data.content += repl('... (read on)', data); } parent.innerHTML = repl('

%(title)s

\ -

%(content)s


', data); + %(content)s

', data); }, page_length: 10 }); diff --git a/erpnext/website/web_cache.py b/erpnext/website/web_cache.py index 18b10b6809..21ec6a8bd3 100644 --- a/erpnext/website/web_cache.py +++ b/erpnext/website/web_cache.py @@ -219,7 +219,7 @@ def delete_cache(page_name): import webnotes webnotes.conn.sql("""delete from `tabWeb Cache` where name=%s""", page_name) -def refresh_cache(): +def refresh_cache(build=False): """delete and re-create web cache entries""" import webnotes @@ -239,7 +239,9 @@ def refresh_cache(): for result in webnotes.conn.sql(query_map[dt], as_dict=1): create_cache(result['page_name'], dt, result['name']) clear_cache(result['page_name'], dt, result['name']) + if build: load_into_cache(result['page_name']) for page_name in get_predefined_pages(): create_cache(page_name, None, None) - clear_cache(page_name, None, None) \ No newline at end of file + clear_cache(page_name, None, None) + if build: load_into_cache(page_name)