summaryrefslogtreecommitdiff
path: root/addons/process/static/src
diff options
context:
space:
mode:
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>2012-11-09 11:10:01 +0530
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>2012-11-09 11:10:01 +0530
commit96dedd0a611e3f22e87566db0f4140c0858d2ed9 (patch)
tree59a71ee96fa67e65f1b851b616dc5d8f6e522623 /addons/process/static/src
parente3ad0798bda07f8d9606da58befb8c4e863a405e (diff)
parent0528e00788a7cca36353a2996ab58568bdd8be78 (diff)
[MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20121109054001-s1w33twd21dmic0k
Diffstat (limited to 'addons/process/static/src')
-rw-r--r--addons/process/static/src/js/process.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index 2405f6d2aa5..73ca4396ce6 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -20,7 +20,7 @@ instance.web.ViewManager.include({
if(this.active_view == 'form') {
this.record_id = this.views[this.active_view].controller.datarecord.id;
}
- this.process_get_object().pipe(function(process) {
+ this.process_get_object().then(function(process) {
if(process && process.length) {
if(process.length > 1) {
self.process_selection = process;
@@ -30,7 +30,7 @@ instance.web.ViewManager.include({
}
}
return $.Deferred().resolve();
- }).pipe(function() {
+ }).then(function() {
var def = $.Deferred();
if(self.process_id) {
$.when(self.process_graph_get()).done(function(res) {
@@ -221,12 +221,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]).then(function(res) {
+ ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).done(function(res) {
var action = res[0][res[0].length - 1];
self.rpc("/web/action/load", {
action_id: action.id,
context: dataset.context
- }).then(function(result) {
+ }).done(function(result) {
action_manager.replace(self.$el);
action_manager.do_action(result.result);
})