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

shifted get_url to startup

Browse Source
This commit is contained in:
Anand Doshi 2013-02-13 23:42:48 +05:30
parent 9c35b2897c
commit 13dc9f3b1f
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
startup/__init__.py
View File

@ -53,3 +53,14 @@ def get_monthly_bulk_mail_limit():
return 999999 return 999999
else: else:
return 500 return 500
def get_url():
from webnotes.utils import get_request_site_address
url = get_request_site_address()
if not url or "localhost" in url:
subdomain = webnotes.conn.get_value("Website Settings", "Website Settings",
"subdomain")
if subdomain:
if "http" not in subdomain:
url = "http://" + subdomain
return url

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

@ -91,6 +91,8 @@ def delete(arg=None):
def notify(arg=None): def notify(arg=None):
from webnotes.utils import cstr from webnotes.utils import cstr
from startup import get_url
fn = webnotes.conn.sql('select first_name, last_name from tabProfile where name=%s', webnotes.user.name)[0] fn = webnotes.conn.sql('select first_name, last_name from tabProfile where name=%s', webnotes.user.name)[0]
if fn[0] or f[1]: if fn[0] or f[1]:
fn = cstr(fn[0]) + (fn[0] and ' ' or '') + cstr(fn[1]) fn = cstr(fn[0]) + (fn[0] and ' ' or '') + cstr(fn[1])
@ -110,14 +112,4 @@ def notify(arg=None):
from webnotes.utils.email_lib import sendmail from webnotes.utils.email_lib import sendmail
sendmail([arg['contact']], sender, message, "You have a message from %s" % (fn,)) sendmail([arg['contact']], sender, message, "You have a message from %s" % (fn,))
def get_url():
from webnotes.utils import get_request_site_address
url = get_request_site_address()
if not url or "localhost" in url:
subdomain = webnotes.conn.get_value("Website Settings", "Website Settings",
"subdomain")
if subdomain:
if "http" not in subdomain:
url = "http://" + subdomain
return url