summaryrefslogtreecommitdiff
path: root/addons/process/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-10-16 10:40:18 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-10-16 10:40:18 +0200
commit5d6fe5cf3a1c3e08183c73118e30d05f81971fca (patch)
tree5adc4bdd6e2ad44ac3047920c21a61b08e06ea37 /addons/process/static/src
parente4e1803fb30bf09ee8cbcb6bf80905fa7261ad6d (diff)
parentdaa7ed0fb52a3fc195eaf370f0376bfbdbe3352f (diff)
Merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20121015091705-wih9n5lulr4fmu9t bzr revid: nicolas.vanhoren@openerp.com-20121016084018-ckjvsczxc0qh02cg
Diffstat (limited to 'addons/process/static/src')
-rw-r--r--addons/process/static/src/js/process.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index 386a9653c02..c214dbb0fdf 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -216,13 +216,12 @@ instance.web.ViewManager.include({
var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
var action_manager = new instance.web.ActionManager(self);
dataset.call('get',
- ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
- function(res) {
+ ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).then(function(res) {
var action = res[0][res[0].length - 1];
self.rpc("/web/action/load", {
action_id: action.id,
context: dataset.context
- }, function(result) {
+ }).then(function(result) {
action_manager.replace(self.$el);
action_manager.do_action(result.result);
})