[IMP]use CompoundContext class.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Wed, 11 Jan 2012 05:24:01 +0000 (10:54 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Wed, 11 Jan 2012 05:24:01 +0000 (10:54 +0530)
bzr revid: vme@tinyerp.com-20120111052401-5vvf6aggna5nfykl

1  2 
addons/web/static/src/js/view_form.js

@@@ -252,8 -255,7 +255,8 @@@ openerp.web.FormView = openerp.web.View
              'None': function () {return null;},
              'context': function (i) {
                  context_index = i;
 -                var ctx = widget.build_context ? widget.build_context() : {};
 +                var ctx = widget.build_context ?
-                     _.extend(widget.build_context(),self.dataset.context):{};
++                    new openerp.web.CompoundContext(widget.build_context(),self.dataset.get_context()):{};
                  return ctx;
              }
          };