summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2011-12-12 11:39:05 +0100
committerAntony Lesuisse <al@openerp.com>2011-12-12 11:39:05 +0100
commit900c2e2daad2e99f8701d47c8a91522efe4163c4 (patch)
tree8404cde45427f8c4e6589a0385df17f14cc7b242 /addons/web/static/src
parent2835985787b686cc875fc82a8ebaacfbee51e195 (diff)
[IMP] action ir.ui.menu
bzr revid: al@openerp.com-20111212103905-6zjkkou9cquxs2ys
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/chrome.js7
-rw-r--r--addons/web/static/src/js/views.js3
2 files changed, 10 insertions, 0 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3c212616496..fa3d1d037a7 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1120,6 +1120,13 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
on_menu_action: function(action) {
this.action_manager.do_action(action);
},
+ do_action: function(action) {
+ console.log("Action",action);
+ if(action.type === "ir.ui.menu") {
+ this.do_reload();
+ this.rpc('/web/menu/action', {'menu_id': action.menu_id}, this.menu.on_menu_action_loaded);
+ }
+ },
do_about: function() {
}
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index d57f9d4a84d..f983cd71cc8 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -177,6 +177,9 @@ session.web.ActionManager = session.web.Widget.extend({
},
ir_actions_act_url: function (action) {
window.open(action.url, action.target === 'self' ? '_self' : '_blank');
+ },
+ ir_ui_menu: function (action) {
+ this.widget_parent.do_action(action);
}
});