From 40f26b7327f991fde5071bfc581adf62ba4b08ec Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 12 Apr 2011 09:50:37 +0200 Subject: [PATCH] [FIX] handling of search views when not provided with an id (still need to go and get a search view, just one with the id 'false' to get the default search view for the model) bzr revid: xmo@openerp.com-20110412075037-6az2uudgp5ktfp8c --- addons/base/static/src/js/views.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 74e058c2c79..5e6e3d72745 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -168,8 +168,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ this.sidebar.start(); } - // init search view - var view_id = this.action.search_view_id ? this.action.search_view_id[0] || false : false; var search_defaults = {}; _.each(this.action.context, function (value, key) { var match = /^search_default_(.*)$/.exec(key); @@ -177,10 +175,12 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ search_defaults[match[1]] = value; } }); - var searchview_loaded = null; - if (view_id) { - searchview_loaded = this.setup_search_view(view_id,search_defaults); - } + + // init search view + var searchview_id = this.action.search_view_id && this.action.search_view_id[0]; + + var searchview_loaded = this.setup_search_view( + searchview_id || false, search_defaults); // schedule auto_search if (searchview_loaded != null && this.action['auto_search']) {