[website] [cleanup] moved website generic utils to framework
diff --git a/website/helpers/blog.py b/website/helpers/blog.py
index 4044353..fb85e0d 100644
--- a/website/helpers/blog.py
+++ b/website/helpers/blog.py
@@ -3,15 +3,15 @@
from __future__ import unicode_literals
import webnotes
-import website.utils
+import webnotes.webutils
from webnotes import _
def clear_blog_cache():
for blog in webnotes.conn.sql_list("""select page_name from
`tabBlog Post` where ifnull(published,0)=1"""):
- website.utils.delete_page_cache(blog)
+ webnotes.webutils.delete_page_cache(blog)
- website.utils.delete_page_cache("writers")
+ webnotes.webutils.delete_page_cache("writers")
@webnotes.whitelist(allow_guest=True)
def get_blog_list(start=0, by=None, category=None):
@@ -44,7 +44,7 @@
from webnotes.utils import global_date_format, get_fullname
res['published'] = global_date_format(res['creation'])
if not res['content']:
- res['content'] = website.utils.get_html(res['page_name'])
+ res['content'] = webnotes.webutils.get_html(res['page_name'])
res['content'] = res['content'][:140]
return result
@@ -71,13 +71,13 @@
comment = webnotes.widgets.form.comments.add_comment(args)
# since comments are embedded in the page, clear the web cache
- website.utils.clear_cache(args.get('page_name'))
+ webnotes.webutils.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' }
# get html of comment row
- comment_html = website.utils.build_html(template_args)
+ comment_html = webnotes.webutils.build_html(template_args)
# notify commentors
commentors = [d[0] for d in webnotes.conn.sql("""select comment_by from tabComment where
@@ -115,8 +115,8 @@
lead.save()
def get_blog_content(blog_page_name):
- import website.utils
- content = website.utils.get_html(blog_page_name)
+ import webnotes.webutils
+ content = webnotes.webutils.get_html(blog_page_name)
import webnotes.utils
content = webnotes.utils.escape_html(content)
return content
diff --git a/website/helpers/make_web_include_files.py b/website/helpers/make_web_include_files.py
index 62b8c66..fe6f05c 100644
--- a/website/helpers/make_web_include_files.py
+++ b/website/helpers/make_web_include_files.py
@@ -3,14 +3,14 @@
import os
import webnotes
-import website.utils
+import webnotes.webutils
def make():
if not webnotes.conn:
webnotes.connect()
- home_page = website.utils.get_home_page()
+ home_page = webnotes.webutils.get_home_page()
fname = 'js/wn-web.js'
if os.path.basename(os.path.abspath('.'))!='public':
diff --git a/website/helpers/product.py b/website/helpers/product.py
index f79d207..4a1cd40 100644
--- a/website/helpers/product.py
+++ b/website/helpers/product.py
@@ -5,7 +5,7 @@
import webnotes
from webnotes.utils import cstr
-from website.utils import build_html, delete_page_cache
+from webnotes.webutils import build_html, delete_page_cache
@webnotes.whitelist(allow_guest=True)
diff --git a/website/helpers/sitemap.py b/website/helpers/sitemap.py
index d35ee56..201865a 100644
--- a/website/helpers/sitemap.py
+++ b/website/helpers/sitemap.py
@@ -13,7 +13,7 @@
global frame_xml, link_xml
import urllib, os
import webnotes
- import website.utils
+ import webnotes.webutils
# settings
max_doctypes = 10
@@ -24,8 +24,8 @@
if domain:
# list of all pages in web cache
- for doctype in website.utils.page_map:
- d = website.utils.page_map[doctype];
+ for doctype in webnotes.webutils.page_map:
+ d = webnotes.webutils.page_map[doctype];
pages = webnotes.conn.sql("""select page_name, `modified`
from `tab%s` where ifnull(%s,0)=1
order by modified desc""" % (doctype, d.condition_field))