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:
Rushabh Mehta 2012-12-07 15:23:41 +01:00
commit 880e26d9c2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utilities/page/messages/messages.py
View File

@ -95,7 +95,7 @@ def notify(arg=None):
fn = webnotes.user.name fn = webnotes.user.name
url = get_url() url = get_url()
message = '''You have a message by <b>%s</b>: message = '''You have a message from <b>%s</b>:
%s %s
@ -106,7 +106,7 @@ def notify(arg=None):
sender = webnotes.user.name!='Administrator' and webnotes.user.name or 'support+admin_post@erpnext.com' sender = webnotes.user.name!='Administrator' and webnotes.user.name or 'support+admin_post@erpnext.com'
from webnotes.utils.email_lib import sendmail from webnotes.utils.email_lib import sendmail
sendmail([arg['contact']], sender, message, fn + ' has posted a new comment') sendmail([arg['contact']], sender, message, "You have a message from %s" % (fn,))
def get_url(): def get_url():
from webnotes.utils import get_request_site_address from webnotes.utils import get_request_site_address

1
website/helpers/blog.py
View File

@ -3,6 +3,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes import webnotes
import website.utils
@webnotes.whitelist(allow_guest=True) @webnotes.whitelist(allow_guest=True)
def get_blog_list(args=None): def get_blog_list(args=None):