Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
4a542cf578
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user