diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-12-07 11:50:08 +0100 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-12-07 11:50:08 +0100 |
| commit | d30c1d8c4f3623d108ce8a72d1c39bffa71d4ebe (patch) | |
| tree | 3c99cb3433ce5470f1b81feba5aaed0f26d93b78 | |
| parent | faa8627737dbae93bb2bf3304c55cc486aa83ce5 (diff) | |
[imp] changed behavior when clicking on a root menu item wihout dashboard to be more consistent
bzr revid: nicolas.vanhoren@openerp.com-20111207105008-bt3m5vytpb2r06lh
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views.js | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index bac2c357c67..d08ff3c7491 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -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) { diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 081a1f47d9d..91d7aafe775 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -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)) { |
