[FIX] need_action: avoid reloading needaction counters when there is no menu

- guard do_load_needaction to prevent exceptions when
  there is no menu to load
- avoid calling do_load_needaction where there is no
  menu to reload in the first place

bzr revid: odo@openerp.com-20130503102248-vjl1b8xju9uwfq97
This commit is contained in:
Olivier Dony 2013-05-03 12:22:48 +02:00
parent 31c3555f94
commit f6f575543f
1 changed files with 9 additions and 3 deletions

View File

@ -900,6 +900,10 @@ instance.web.Menu = instance.web.Widget.extend({
},
do_load_needaction: function (menu_ids) {
var self = this;
menu_ids = _.reject(menu_ids, _.isEmpty);
if (_.isEmpty(menu_ids)) {
return $.when();
}
return this.rpc("/web/menu/load_needaction", {'menu_ids': menu_ids}).done(function(r) {
self.on_needaction_loaded(r);
});
@ -1037,9 +1041,11 @@ instance.web.Menu = instance.web.Widget.extend({
},
do_reload_needaction: function () {
var self = this;
self.do_load_needaction([self.current_menu]).then(function () {
self.trigger("need_action_reloaded");
});
if (self.current_menu) {
self.do_load_needaction([self.current_menu]).then(function () {
self.trigger("need_action_reloaded");
});
}
},
/**
* Jquery event handler for menu click