nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 17:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'latest' of github.com:webnotes/erpnext into latest

Browse Source
This commit is contained in:
Anand Doshi
2012-02-13 19:00:24 +05:30
parent d7ddea1e2a bfc03cf8bd
commit 2c582d5f65
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/home/page/event_updates/event_updates.py
View File

@@ -2,7 +2,7 @@ import webnotes
from webnotes.utils import cint from webnotes.utils import cint
@webnotes.whitelist() @webnotes.whitelist()
def get_online_users(): def get_online_users(arg=None):
# get users # get users
return webnotes.conn.sql("""SELECT DISTINCT t1.user, t2.first_name, t2.last_name return webnotes.conn.sql("""SELECT DISTINCT t1.user, t2.first_name, t2.last_name
from tabSessions t1, tabProfile t2 from tabSessions t1, tabProfile t2
@@ -10,8 +10,7 @@ def get_online_users():
and t1.user not in ('Guest','Administrator') and t1.user not in ('Guest','Administrator')
and TIMESTAMPDIFF(HOUR,t1.lastupdate,NOW()) <= 1""", as_list=1) or [] and TIMESTAMPDIFF(HOUR,t1.lastupdate,NOW()) <= 1""", as_list=1) or []
@webnotes.whitelist() def get_unread_messages(arg=None):
def get_unread_messages():
"returns unread (docstatus-0 messages for a user)" "returns unread (docstatus-0 messages for a user)"
return cint(webnotes.conn.sql("""SELECT COUNT(*) FROM `tabComment Widget Record` return cint(webnotes.conn.sql("""SELECT COUNT(*) FROM `tabComment Widget Record`
WHERE comment_doctype='My Company' WHERE comment_doctype='My Company'
@@ -41,8 +40,7 @@ def get_status_details(arg=None):
} }
return ret return ret
@webnotes.whitelist() def get_setup_status(arg=None):
def get_setup_status():
""" """
Returns the setup status of the current account Returns the setup status of the current account
""" """

3
erpnext/home/page/my_company/my_company.py
View File

@@ -107,6 +107,7 @@ def send_welcome_mail(email, args):
# #
# post comment # post comment
# #
@webnotes.whitelist()
def post_comment(arg): def post_comment(arg):
arg = load_json(arg) arg = load_json(arg)
@@ -149,6 +150,7 @@ def post_comment(arg):
# #
# update read messages # update read messages
# #
@webnotes.whitelist()
def set_read_all_messages(arg=''): def set_read_all_messages(arg=''):
webnotes.conn.sql("""UPDATE `tabComment Widget Record` webnotes.conn.sql("""UPDATE `tabComment Widget Record`
SET docstatus = 1 SET docstatus = 1
@@ -156,6 +158,7 @@ def set_read_all_messages(arg=''):
AND comment_docname = %s AND comment_docname = %s
""", webnotes.user.name) """, webnotes.user.name)
@webnotes.whitelist()
def update_security(args=''): def update_security(args=''):
import json import json
args = json.loads(args) args = json.loads(args)