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

messages, popups disabled

Browse Source
This commit is contained in:
Rushabh Mehta
2012-11-13 10:59:11 +05:30
parent ab55e6b252
commit ec40686cc3
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/startup.js
View File

@@ -108,7 +108,7 @@ erpnext.update_messages = function(reset) {
}
}
show_in_circle('unread_messages', r.message.unread_messages.length);
show_in_circle('unread_messages', r.message.unread_messages);
show_in_circle('open_support_tickets', r.message.open_support_tickets);
show_in_circle('things_todo', r.message.things_todo);
show_in_circle('todays_events', r.message.todays_events);

11
public/js/toolbar.js
View File

@@ -89,16 +89,9 @@ erpnext.toolbar.set_new_comments = function(new_comments) {
var navbar_nc = $('.navbar-new-comments');
if(wn.container.page && wn.container.page.page_name=="messages")
return;
if(new_comments && new_comments.length>0) {
navbar_nc.text(new_comments.length);
if(new_comments) {
navbar_nc.text(new_comments);
navbar_nc.addClass('navbar-new-comments-true')
$.each(new_comments, function(i, v) {
var msg = 'New Message: ' + (v[1].length<=100 ? v[1] : (v[1].substr(0, 100) + "..."));
var id = v[0].replace('/', '-');
if(!$('#' + id)[0]) {
show_alert(msg).attr("id", id);
}
});
} else {
navbar_nc.removeClass('navbar-new-comments-true');
navbar_nc.text(0);