odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[imp] changed behavior when clicking on a root menu item wihout dashboard to be more consistent 

bzr revid: nicolas.vanhoren@openerp.com-20111207105008-bt3m5vytpb2r06lh
This commit is contained in:
niv-openerp 2011-12-07 11:50:08 +01:00
parent faa8627737
commit d30c1d8c4f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/chrome.js
View File

@ -973,6 +973,8 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
if (data.action.length) {
var action = data.action[0][2];
self.on_action(action);
} else {
self.on_action({type: 'null_action'});
}
},
on_action: function(action) {

4
addons/web/static/src/js/views.js
View File

@ -90,6 +90,10 @@ session.web.ActionManager = session.web.Widget.extend({
}
return this[type](action, on_close);
},
null_action: function() {
this.dialog_stop();
this.content_stop();
},
ir_actions_act_window: function (action, on_close) {
if (_(['base.module.upgrade', 'base.setup.installer'])
.contains(action.res_model)) {