[fix] problem with email template preview
authorniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 12 Jan 2012 15:34:19 +0000 (16:34 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 12 Jan 2012 15:34:19 +0000 (16:34 +0100)
bzr revid: nicolas.vanhoren@openerp.com-20120112153419-morwrmy7ozqxup6f

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

@@@ -257,7 -255,8 +257,7 @@@ 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 ?
 -                    new openerp.web.CompoundContext(widget.build_context(),self.dataset.get_context()):{};
++                var ctx = new openerp.web.CompoundContext(self.dataset.get_context(), widget.build_context() ? widget.build_context() : {});
                  return ctx;
              }
          };