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

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

Browse Source 
Conflicts:
	version.num
This commit is contained in:
Rushabh Mehta
2012-03-14 07:58:10 +01:00
parent db97d28e77 990599ad9a
commit 3bbc7aeeb8
11 changed files with 136 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/startup/startup.js
View File

@@ -110,20 +110,29 @@ var update_messages = function(reset) {
if(inList(['Guest'], user)) { return; }
if(!reset) {
$c_page('home', 'event_updates', 'get_unread_messages', null,
$c_page('home', 'event_updates', 'get_global_status_messages', null,
function(r,rt) {
if(!r.exc) {
// This function is defined in toolbar.js
page_body.wntoolbar.set_new_comments(r.message);
var circle = $('#msg_count')
if(circle) {
if(r.message.length) {
circle.find('span:first').text(r.message.length);
circle.toggle(true);
} else {
circle.toggle(false);
page_body.wntoolbar.set_new_comments(r.message.unread_messages);
var show_in_circle = function(parent_id, msg) {
var parent = $('#'+parent_id);
if(parent) {
if(msg) {
parent.find('span:first').text(msg);
parent.toggle(true);
} else {
parent.toggle(false);
}
}
}
show_in_circle('unread_messages', r.message.unread_messages.length);
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);
} else {
clearInterval(wn.updates.id);
}
@@ -131,7 +140,7 @@ var update_messages = function(reset) {
);
} else {
page_body.wntoolbar.set_new_comments(0);
$('#msg_count').toggle(false);
$('#unread_messages').toggle(false);
}
}