浏览代码

[notification] [minor] [fix]

version-14
Rushabh Mehta 12 年前
父节点
当前提交
e955a898fa
共有 2 个文件被更改,包括 14 次插入14 次删除
  1. +13
    -13
      core/page/desktop/desktop.js
  2. +1
    -1
      core/page/user_properties/user_properties.js

+ 13
- 13
core/page/desktop/desktop.js 查看文件

@@ -72,21 +72,21 @@ wn.core.pages.desktop.show_pending_notifications = function() {
var modules_list = wn.user.get_desktop_items(); var modules_list = wn.user.get_desktop_items();
$.each(modules_list, function(i, module) { $.each(modules_list, function(i, module) {
var module_doctypes = wn.boot.notification_info.module_doctypes[module]; var module_doctypes = wn.boot.notification_info.module_doctypes[module];

var sum = 0;
if(module_doctypes) { if(module_doctypes) {
var sum = 0;
if(module_doctypes) {
$.each(module_doctypes, function(j, doctype) {
sum += (wn.boot.notification_info.open_count_doctype[doctype] || 0);
});
} else if(wn.boot.notification_info.open_count_module[module]!=null) {
sum = wn.boot.notification_info.open_count_module[module];
}
var notifier = $("#module-count-" + wn.modules[module]._link);
if(notifier.length) {
notifier.toggle(sum ? true : false);
notifier.find(".circle-text").html(sum || "");
}
$.each(module_doctypes, function(j, doctype) {
sum += (wn.boot.notification_info.open_count_doctype[doctype] || 0);
});
} else if(wn.boot.notification_info.open_count_module[module]!=null) {
sum = wn.boot.notification_info.open_count_module[module];
} }
var notifier = $("#module-count-" + wn.modules[module]._link);
if(notifier.length) {
notifier.toggle(sum ? true : false);
notifier.find(".circle-text").html(sum || "");
}

}); });
} }




+ 1
- 1
core/page/user_properties/user_properties.js 查看文件

@@ -142,7 +142,7 @@ wn.UserProperties = Class.extend({
}, },
add_delete_button: function(row, d) { add_delete_button: function(row, d) {
var me = this; var me = this;
$("<button class='btn btn-small'><i class='icon-remove'></i></button>")
$("<button class='btn btn-small btn-default'><i class='icon-remove'></i></button>")
.appendTo($("<td>").appendTo(row)) .appendTo($("<td>").appendTo(row))
.attr("data-name", d.name) .attr("data-name", d.name)
.attr("data-user", d.parent) .attr("data-user", d.parent)


正在加载...
取消
保存