Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2012-12-06 16:52:38 +05:30
commit 787374b79e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/december_2012/website_cache_refactor.py
View File

@ -11,11 +11,11 @@ def execute():
from markdown2 import markdown from markdown2 import markdown
for page in webnotes.conn.sql("""select name, main_section from `tabWeb Page`"""): for page in webnotes.conn.sql("""select name, main_section from `tabWeb Page`"""):
m = markdown(page[1]).encode("utf8") m = markdown(page[1] or "").encode("utf8")
webnotes.conn.set_value("Web Page", page[0], "main_section", m) webnotes.conn.set_value("Web Page", page[0], "main_section", m)
for page in webnotes.conn.sql("""select name, content from `tabBlog`"""): for page in webnotes.conn.sql("""select name, content from `tabBlog`"""):
m = markdown(page[1]).encode("utf8") m = markdown(page[1] or "").encode("utf8")
webnotes.conn.set_value("Blog", page[0], "content", m) webnotes.conn.set_value("Blog", page[0], "content", m)
# delete website cache # delete website cache

2
website/web_cache.py
View File

@ -22,6 +22,7 @@ import os
import conf import conf
import webnotes import webnotes
import website.utils import website.utils
from webnotes.utils import cstr
template_map = { template_map = {
'Web Page': 'html/web_page.html', 'Web Page': 'html/web_page.html',
@ -42,7 +43,6 @@ def get_page_html(page_name, comments=''):
comments += "\n\npage load status: cache" comments += "\n\npage load status: cache"
# insert comments # insert comments
import webnotes.utils
html += """\n<!-- %s -->""" % webnotes.utils.cstr(comments) html += """\n<!-- %s -->""" % webnotes.utils.cstr(comments)
return html return html