odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] correctly loads default filters (addon web) 

also, hide/show the custom reports list when it is empty/non empty
This commit is contained in:
Géry Debongnie 2014-05-21 14:27:17 +02:00
parent aec3ba08ae
commit 36471c3955
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/web/static/src/js/search.js
View File

@ -852,10 +852,10 @@ instance.web.SearchViewDrawer = instance.web.Widget.extend({
defaults_fetched = $.when.apply(null, _(this.inputs).invoke(
'facet_for_defaults', this.searchview.defaults));
return $.when(add_custom_reports, add_filters, add_rest, defaults_fetched);
return $.when(defaults_fetched, add_custom_reports, add_filters, add_rest);
},
notify_searchview: function () {
var defaults = arguments[1];
var defaults = arguments[1][0];
this.ready.resolve.apply(null, defaults);
},
/**
@ -1809,6 +1809,9 @@ instance.web.search.CustomReports = instance.web.search.Input.extend({
$filter.remove();
delete self.$filters[key];
delete self.filters[key];
if (!self.filters.length) {
self.hide();
}
});
})
.appendTo($filter);
@ -1817,6 +1820,7 @@ instance.web.search.CustomReports = instance.web.search.Input.extend({
this.$filters[key].unbind('click').click(function () {
self.toggle_filter(filter);
});
this.show();
},
toggle_filter: function (filter, preventSearch) {
var current = this.view.query.find(function (facet) {
@ -1833,6 +1837,15 @@ instance.web.search.CustomReports = instance.web.search.Input.extend({
},
set_filters: function (filters) {
_(filters).map(_.bind(this.append_filter, this));
if (!filters.length) {
this.hide();
}
},
hide: function () {
this.$el.hide();
},
show: function () {
this.$el.show();
},
});