diff --git a/erpnext/startup/toolbar.js b/erpnext/startup/toolbar.js index c73d54ed38d..7eda49361c6 100644 --- a/erpnext/startup/toolbar.js +++ b/erpnext/startup/toolbar.js @@ -22,13 +22,10 @@ erpnext.toolbar.setup = function() { erpnext.toolbar.add_modules(); // profile - $('#toolbar-user').append('
  • Profile Settings
    • '); - - $('#toolbar-user').append('
  • Team / Messages
    • '); - + $('#toolbar-user').append('
  • Profile Settings
    • '); $('.navbar .pull-right').append('\ -
    • '); +
    • '); // help $('.navbar .pull-right').prepend('
  • \ diff --git a/erpnext/utilities/page/messages/messages.py b/erpnext/utilities/page/messages/messages.py index 0adeb8da985..6ca2817f13f 100644 --- a/erpnext/utilities/page/messages/messages.py +++ b/erpnext/utilities/page/messages/messages.py @@ -8,6 +8,13 @@ def get_list(arg=None): webnotes.form_dict['user'] = webnotes.session['user'] if webnotes.form_dict['contact'] == webnotes.session['user']: + # set all messages as read + webnotes.conn.sql("""UPDATE `tabComment Widget Record` + set docstatus = 1 where comment_doctype in ('My Company', 'Message') + and comment_docname = %s + """, webnotes.user.name) + + # return messages return webnotes.conn.sql("""select * from `tabComment Widget Record` where (owner=%(contact)s or comment_docname=%(user)s) and comment_doctype in ('My Company', 'Message') diff --git a/js/all-app.js b/js/all-app.js index b6cf87c2e60..17a649d1b86 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2152,7 +2152,7 @@ me.dialog.clear();me.dialog.show();}}); /* * lib/js/legacy/app.js */ -var popup_cont;var session={};var start_sid=null;if(!wn)var wn={};function startup(){start_sid=get_cookie('sid');popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.boot.user_fullnames[user];user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={} +var popup_cont;var session={};var start_sid=null;if(!wn)var wn={};function startup(){start_sid=get_cookie('sid');popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.boot.user_fullnames?wn.boot.user_fullnames[user]:'Guest';user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={} if(r.dt_labels){for(key in r.dt_labels)session.rev_dt_labels[r.dt_labels[key]]=key;} wn.control_panel=r.control_panel;} var setup_history=function(r){rename_observers.push(nav_obj);} @@ -2221,8 +2221,8 @@ erpnext.module_page.make_list=function(module,wrapper){wrapper.list=new wn.widge /* * erpnext/startup/toolbar.js */ -wn.provide('erpnext.toolbar');erpnext.toolbar.setup=function(){erpnext.toolbar.add_modules();$('#toolbar-user').append('
  • Profile Settings
    • ');$('#toolbar-user').append('
  • Team / Messages
    • ');$('.navbar .pull-right').append('\ -
    • ');$('.navbar .pull-right').prepend('
  • \ +wn.provide('erpnext.toolbar');erpnext.toolbar.setup=function(){erpnext.toolbar.add_modules();$('#toolbar-user').append('
  • Profile Settings
    • ');$('.navbar .pull-right').append('\ +
    • ');$('.navbar .pull-right').prepend('
  • \ Help\