From 864e850e97a63d4d62a968a9f2e271af351b2177 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 9 Aug 2011 10:11:36 +0200 Subject: [PATCH] [FIX] set action domain in the SearchDataSet in ViewManagerAction, use that to query the first treeview level bzr revid: xmo@openerp.com-20110809081136-1q1nowzq4xj4jcwu --- addons/base/static/src/js/tree.js | 1 - addons/base/static/src/js/views.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/base/static/src/js/tree.js b/addons/base/static/src/js/tree.js index a7e2833a20e..c20759f26f6 100644 --- a/addons/base/static/src/js/tree.js +++ b/addons/base/static/src/js/tree.js @@ -50,7 +50,6 @@ openerp.base.TreeView = openerp.base.View.extend({ }); this.fields = fields_view.fields; - self.dataset.domain = [['parent_id', '=', '']]; this.dataset.read_slice([], 0, false, function (response) { self.$element.html(QWeb.render('TreeView', { "first_level": response, diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js index 21e2589a236..be6e9963335 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -264,11 +264,11 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({ init: function(session, element_id, action) { var dataset; if (!action.res_id) { - dataset = new openerp.base.DataSetSearch(session, action.res_model, action.context || null); + dataset = new openerp.base.DataSetSearch(session, action.res_model, action.context || null, action.domain || null); } else { dataset = new openerp.base.DataSetStatic(session, action.res_model, {}, [action.res_id]); if (action.context) { - // TODO fme: should normalize all DataSets constructors to (session, model, context, ...) + // TODO fme: should normalize all DataSets constructors to (session, model, context, domain, ...) dataset.context = action.context; } }