Merge branch 'master' into dev

This commit is contained in:
Anand Doshi 2012-07-13 01:45:33 +05:30
commit 46ac229edc
2 changed files with 4 additions and 8 deletions

View File

@ -34,12 +34,8 @@ class DocType:
# clear web cache
import website.web_cache
website.web_cache.refresh_cache()
# create blog pages
import webnotes.cms.feed
webnotes.cms.feed.generate()
website.web_cache.refresh_cache(build=['Blog'])
from webnotes.session_cache import clear_cache
clear_cache('Guest')

View File

@ -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(build=False):
def refresh_cache(build=None):
"""delete and re-create web cache entries"""
import webnotes
@ -239,7 +239,7 @@ def refresh_cache(build=False):
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'])
if build and dt in build: load_into_cache(result['page_name'])
for page_name in get_predefined_pages():
create_cache(page_name, None, None)