updated feed for comments and login
diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py
index d9fb451..e3e7fa9 100644
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -1,18 +1,18 @@
import webnotes
import webnotes.defs
from webnotes.utils import cint
+import home
def on_login(login_manager):
"""
called from login manager, before login
"""
- try:
- if login_manager.user not in ('Guest', None, ''):
+ if login_manager.user not in ('Guest', None, ''):
+ try:
import server_tools.gateway_utils
server_tools.gateway_utils.check_login(login_manager.user)
- except ImportError:
- pass
-
+ except ImportError:
+ pass
def on_login_post_session(login_manager):
"""
@@ -29,9 +29,21 @@
sid!=%s""", \
(webnotes.session['user'], webnotes.session['sid']), as_list=1)
+ if webnotes.session['user'] not in ('Guest'):
+ # create feed
+ from webnotes.utils import nowtime
+ home.make_feed('Login', 'Profile', login_manager.user, login_manager.user,
+ '%s logged in at %s' % (login_manager.user_fullname, nowtime()),
+ login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')
+
+def comment_added(doc):
+ """add comment to feed"""
+ import json
+ home.make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by,
+ '<i>"' + doc.comment + '"</i>', '#6B24B3')
+
def doclist_all(doc, method):
"""doclist trigger called from webnotes.model.doclist on any event"""
- import home
home.update_feed(doc, method)
def boot_session(bootinfo):
@@ -51,5 +63,6 @@
def get_letter_heads():
"""load letter heads with startup"""
import webnotes
- ret = webnotes.conn.sql("select name, content from `tabLetter Head` where ifnull(disabled,0)=0")
+ ret = webnotes.conn.sql("""select name, content from `tabLetter Head`
+ where ifnull(disabled,0)=0""")
return dict(ret)