Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/config.json b/config.json
index bdc8748..29d24fe 100644
--- a/config.json
+++ b/config.json
@@ -84,6 +84,7 @@
"args_method": "website.doctype.about_us_settings.about_us_settings.get_args"
},
"account": {
+ "no_cache": true,
"template": "app/website/templates/pages/account"
},
"attributions": {
@@ -106,6 +107,7 @@
"args_method": "selling.doctype.sales_order.sales_order.get_website_args"
},
"orders": {
+ "no_cache": true,
"template": "app/website/templates/pages/orders",
"args_method": "selling.doctype.sales_order.sales_order.get_currency_and_number_format"
},
diff --git a/docs/docs.dev.md b/docs/docs.dev.md
index 008391a..76ba660 100644
--- a/docs/docs.dev.md
+++ b/docs/docs.dev.md
@@ -5,7 +5,9 @@
"docs.dev.install",
"docs.dev.quickstart",
"docs.dev.framework",
- "docs.dev.modules"
+ "docs.dev.api",
+ "docs.dev.modules",
+ "docs.dev.translate",
]
}
---
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index dd96f46..423f76e 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -21,7 +21,9 @@
var $tbody = $('<table class="table table-bordered"><tbody></tbody></table>')
.appendTo(parent).find("tbody");
$.each(r.message, function(i, log) {
- if(log.message.indexOf("minor")===-1 && log.message.indexOf("[")!==-1) {
+ if(log.message.indexOf("minor")===-1
+ && log.message.indexOf("docs")===-1
+ && log.message.indexOf("[")!==-1) {
log.message = log.message.replace(/(\[[^\]]*\])/g,
function(match, p1, offset, string) {
match = match.toLowerCase();
diff --git a/website/helpers/blog.py b/website/helpers/blog.py
index 2504067..ae52c79 100644
--- a/website/helpers/blog.py
+++ b/website/helpers/blog.py
@@ -92,14 +92,15 @@
comment_doctype='Blog Post' and comment_docname=%s and
ifnull(unsubscribed, 0)=0""", args.get('comment_docname'))]
- blog = webnotes.conn.sql("""select * from `tabBlog Post` where name=%s""",
- args.get('comment_docname'), as_dict=1)[0]
+ blog = webnotes.doc("Blog Post", args.get("comment_docname"))
+ blogger_profile = webnotes.conn.get_value("Blogger", blog.blogger, "profile")
+ blogger_email = webnotes.conn.get_value("Profile", blogger_profile, "email")
from webnotes.utils.email_lib.bulk import send
- send(recipients=list(set(commentors + [blog['owner']])),
+ send(recipients=list(set(commentors + [blogger_email])),
doctype='Comment',
email_field='comment_by',
- subject='New Comment on Blog: ' + blog['title'],
+ subject='New Comment on Blog: ' + blog.title,
message='%(comment)s<p>By %(comment_by_fullname)s</p>' % args)
return comment_html.replace("\n", "")