From 2d87d908e244d6f0fc7621038e90f29621a6f8ea Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 13 Feb 2013 13:56:06 +0100 Subject: [PATCH] [IMP] do not add empty filter groups to the drawer columns bzr revid: xmo@openerp.com-20130213125606-ykbb2kg9wvfbs2ho --- addons/web/static/src/js/search.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 8422f4e55fe..50065b300b4 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1715,15 +1715,22 @@ instance.web.search.Filters = instance.web.search.Input.extend({ .sum() .value(); - var col1 = [], col2 = _(this.view.controls).map(function (inputs, group) { - var filters = _(inputs).filter(is_group); - return { - name: group === 'null' ? "q " + _t("Filters") : "w " + group, - filters: filters, - length: _(filters).chain().map(function (i) { - return i.filters.length; }).sum().value() - }; - }); + var col1 = [], col2 = _(this.view.controls).chain() + .map(function (inputs, group) { + return {group: group, inputs: inputs}; + }).reject(function (item) { + return _(item.inputs).isEmpty(); + }).map(function (item) { + var filters = _(item.inputs).filter(is_group); + return { + name: item.group === 'null' + ? "q " + _t("Filters") + : "w " + item.group, + filters: filters, + length: _(filters).chain().map(function (i) { + return i.filters.length; }).sum().value() + }; + }).value(); while (col2.length) { // col1 + group should be smaller than col2 + group