From de0d177627d571eb6bd88b5397c901d06498549c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 28 Jun 2011 16:49:25 +0200 Subject: [PATCH 1/2] [FIX] bug in CompoundDomain: need self alias to this bzr revid: xmo@openerp.com-20110628144925-c138oielqt6ukozj --- addons/base/static/src/js/views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index e165bb3c165..ee4388c8971 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -459,7 +459,7 @@ openerp.base.View = openerp.base.Controller.extend({ result : { type: 'ir.actions.act_window_close', special: action_data.special } }); } else { - var context = new openerp.base.CompoundContext(dataset.context).add(action_data.context || {}); + var context = new openerp.base.CompoundContext(dataset.context, action_data.context || {}); switch(action_data.type) { case 'object': return dataset.call_button(action_data.name, [[record_id], context], handler); From 7b91cbdab898c7561740277a3365443a1f1a622c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 28 Jun 2011 16:55:08 +0200 Subject: [PATCH 2/2] [FIX] trailing comma bzr revid: xmo@openerp.com-20110628145508-jimwnt2syyptkg89 --- addons/base/static/src/js/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js index 389f9334b47..e8886009dd9 100644 --- a/addons/base/static/src/js/data.js +++ b/addons/base/static/src/js/data.js @@ -574,7 +574,7 @@ openerp.base.BufferedDataSet = openerp.base.DataSetStatic.extend({ return_records(); } return completion.promise(); - }, + } }); openerp.base.ReadOnlyDataSetSearch = openerp.base.DataSetSearch.extend({