From 11a967f38e2bb72766b6a0b4b1e6524bb4ab1d87 Mon Sep 17 00:00:00 2001 From: "Tejas (OpenERP)" Date: Wed, 23 Nov 2011 16:00:00 +0530 Subject: [PATCH] [tta] use rpc to get right context, search with right contexts bzr revid: tta@openerp.com-20111123103000-vf6zrj1lzgrm6gbo --- addons/web/static/src/js/view_form.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 178f326f437..ad84bc072f5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2535,15 +2535,6 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope this._super(); var self = this; search_defaults = {}; - if( "__contexts" in this.context.__contexts[0]) - { - _.each(this.context.__contexts[0].__contexts[0], function (value, key) { - var match = /^search_default_(.*)$/.exec(key); - if (match) { - search_defaults[match[1]] = value; - } - }); - } this.dataset = new openerp.web.ProxyDataSet(this, this.model, this.context); this.dataset.create_function = function() { @@ -2558,7 +2549,18 @@ openerp.web.form.SelectCreatePopup = openerp.web.OldWidget.extend(/** @lends ope this.dataset.parent_view = this.options.parent_view; this.dataset.on_default_get.add(this.on_default_get); if (this.options.initial_view == "search") { - this.setup_search_view(search_defaults); + self.rpc('/web/session/eval_domain_and_context', { + domains: [] , + contexts: [this.context], + }, function (results) { + _.each(results.context, function (value, key) { + var match = /^search_default_(.*)$/.exec(key); + if (match) { + search_defaults[match[1]] = value; + } + }); + self.setup_search_view(search_defaults); + }); } else { // "form" this.new_object(); }