From 07005c983afdb57c2e2f15139fd358ac388d1326 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 27 Dec 2011 17:14:09 +0530 Subject: [PATCH 1/2] [FIX]extend two context. lp bug: https://launchpad.net/bugs/906236 fixed bzr revid: vme@tinyerp.com-20111227114409-czwzx077hvjvjnee --- addons/web/static/src/js/view_form.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 5619f42f269..62268b7b81f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -252,7 +252,8 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# 'None': function () {return null;}, 'context': function (i) { context_index = i; - var ctx = widget.build_context ? widget.build_context() : {}; + ar ctx = widget.build_context ? + _.extend(widget.build_context(),self.dataset.context):{}; return ctx; } }; From 1e23dca365b5a8c5e8808bff01d874aa1e0f71f4 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 27 Dec 2011 17:27:34 +0530 Subject: [PATCH 2/2] [IMP]remove error. bzr revid: vme@tinyerp.com-20111227115734-i7fkcsn7yhohbh90 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 62268b7b81f..818c50616af 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -252,7 +252,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# 'None': function () {return null;}, 'context': function (i) { context_index = i; - ar ctx = widget.build_context ? + var ctx = widget.build_context ? _.extend(widget.build_context(),self.dataset.context):{}; return ctx; }