summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-02-13 13:56:06 +0100
committerXavier Morel <xmo@openerp.com>2013-02-13 13:56:06 +0100
commit2d87d908e244d6f0fc7621038e90f29621a6f8ea (patch)
treeb897bda3b10b4e811449b563034b6f3dca665564 /addons/web/static/src
parentdfb7493034f2b102d647967654f5c99893450e2b (diff)
[IMP] do not add empty filter groups to the drawer columns
bzr revid: xmo@openerp.com-20130213125606-ykbb2kg9wvfbs2ho
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/search.js25
1 files 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' ? "<span class='oe_i'>q</span> " + _t("Filters") : "<span class='oe_i'>w</span> " + 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'
+ ? "<span class='oe_i'>q</span> " + _t("Filters")
+ : "<span class='oe_i'>w</span> " + 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