X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fweb%2Fstatic%2Fsrc%2Fjs%2Fview_form.js;h=2c730d0b5af2b29b3b37d79b0f0fe23fed057156;hb=60d9065ff1d0115be69440cdc44543ddceab81a9;hp=fea6ba21e014f840d57668d10ce3d5fdd36973c0;hpb=90043e5b098400970be941ef8194d55b4e1608a7;p=odoo%2Fodoo.git

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index fea6ba2..2c730d0 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1007,19 +1007,18 @@ openerp.web.form.Field = openerp.web.form.Widget.extend(/** @lends openerp.web.f
      * the fields'context with the action's context.
      */
     build_context: function() {
-        // I previously belevied contexts should be herrited, but now I doubt it
-        //var a_context = this.view.dataset.get_context() || {};
         var f_context = this.field.context || null;
         // maybe the default_get should only be used when we do a default_get?
-        var v_context1 = this.node.attrs.default_get || {};
-        var v_context2 = this.node.attrs.context || {};
-        var v_context = new openerp.web.CompoundContext(v_context1, v_context2);
-        if (v_context1.__ref || v_context2.__ref || true) { //TODO niv: remove || true
+        var v_contexts = _.compact([this.node.attrs.default_get || null,
+            this.node.attrs.context || null]);
+        var v_context = new openerp.web.CompoundContext();
+        _.each(v_contexts, function(x) {v_context.add(x);});
+        if (_.detect(v_contexts, function(x) {return !!x.__ref;})) {
             var fields_values = this._build_view_fields_values();
             v_context.set_eval_context(fields_values);
         }
         // if there is a context on the node, overrides the model's context
-        var ctx = f_context || v_context;
+        var ctx = v_contexts.length > 0 ? v_context : f_context;
         return ctx;
     },
     build_domain: function() {