Merge lp:~openerp-dev/openerp-web/7.0-fix-needaction-parented into lp:openerp-web/7.0

Proposed by Thibault Delavallée (OpenERP)
Status: Merged
Merged at revision: 3918
Proposed branch: lp:~openerp-dev/openerp-web/7.0-fix-needaction-parented
Merge into: lp:openerp-web/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
addons/web/static/src/js/chrome.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-fix-needaction-parented
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+162621@code.launchpad.net

Commit message

[FIX] mail: locate current menu using a safer method + check `undefined` case

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/chrome.js'
2--- addons/web/static/src/js/chrome.js 2013-05-03 10:22:48 +0000
3+++ addons/web/static/src/js/chrome.js 2013-05-06 15:29:41 +0000
4@@ -900,7 +900,7 @@
5 },
6 do_load_needaction: function (menu_ids) {
7 var self = this;
8- menu_ids = _.reject(menu_ids, _.isEmpty);
9+ menu_ids = _.compact(menu_ids);
10 if (_.isEmpty(menu_ids)) {
11 return $.when();
12 }