[FIX] check default filter in drawer
bzr revid: xmo@openerp.com-20121112154815-e9a8dn5gwqyi7s80
This commit is contained in:
parent
e001c965a5
commit
7e6c3be96f
|
@ -676,8 +676,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
|
||||||
return filter.user_id && filter.is_default;
|
return filter.user_id && filter.is_default;
|
||||||
});
|
});
|
||||||
if (personal_filter) {
|
if (personal_filter) {
|
||||||
this.query.reset([this.custom_filters.facet_for(personal_filter)],
|
this.custom_filters.enable_filter(personal_filter, true);
|
||||||
{preventSearch: true});
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -685,8 +684,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
|
||||||
return !filter.user_id && filter.is_default;
|
return !filter.user_id && filter.is_default;
|
||||||
});
|
});
|
||||||
if (global_filter) {
|
if (global_filter) {
|
||||||
this.query.reset([this.custom_filters.facet_for(global_filter)],
|
this.custom_filters.enable_filter(global_filter, true);
|
||||||
{preventSearch: true});
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1617,10 +1615,14 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
|
||||||
}
|
}
|
||||||
|
|
||||||
$filter.unbind('click').click(function () {
|
$filter.unbind('click').click(function () {
|
||||||
self.view.query.reset([self.facet_for(filter)]);
|
self.enable_filter(filter);
|
||||||
$filter.addClass('oe_selected');
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
enable_filter: function (filter, preventSearch) {
|
||||||
|
this.view.query.reset([this.facet_for(filter)], {
|
||||||
|
preventSearch: preventSearch || false});
|
||||||
|
this.$filters[this.key_for(filter)].addClass('oe_selected');
|
||||||
|
},
|
||||||
set_filters: function (filters) {
|
set_filters: function (filters) {
|
||||||
_(filters).map(_.bind(this.append_filter, this));
|
_(filters).map(_.bind(this.append_filter, this));
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue