summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-05-18 17:23:42 +0200
committerXavier Morel <xmo@openerp.com>2012-05-18 17:23:42 +0200
commit1568d25eb06648d7963fa4fffa06e519b5af2eae (patch)
tree996ea2e7ef3dc38f691c32618b94d24cc387e3e2 /addons/web/static/src/js
parentce18f726b4b9694181ba2e84f36bea98ca049ce7 (diff)
[ADD] marking of currently selected filters in the drawer
Visually hints to users currently manipulating the drawer that a given filter is currently selected. bzr revid: xmo@openerp.com-20120518152342-xmqhwlml0bsgodhq
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/search.js36
1 files changed, 32 insertions, 4 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 2532dead00d..91423b5c53e 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -644,8 +644,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
// load defaults
var defaults_fetched = $.when.apply(null, _(this.inputs).invoke(
'facet_for_defaults', this.defaults)).then(function () {
- self.query.reset(_(arguments).compact(), {silent: true});
- self.renderFacets();
+ self.query.reset(_(arguments).compact(), {preventSearch: true});
});
return $.when(drawer_started, defaults_fetched)
@@ -800,7 +799,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
*
* @param e jQuery event object coming from the "Search" button
*/
- do_search: function () {
+ do_search: function (_query, options) {
+ if (options && options.preventSearch) {
+ return;
+ }
var search = this.build_search_data();
if (!_.isEmpty(search.errors)) {
this.on_invalid(search.errors);
@@ -1009,11 +1011,34 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in
}
this._super(view);
this.filters = filters;
+ this.view.query.on('add remove change reset', this.proxy('search_change'));
},
start: function () {
this.$element.on('click', 'li', this.proxy('toggle_filter'));
return $.when(null);
},
+ /**
+ * Handles change of the search query: any of the group's filter which is
+ * in the search query should be visually checked in the drawer
+ */
+ search_change: function () {
+ var self = this;
+ var $filters = this.$element.find('> li').removeClass('oe_selected');
+ var facet = this.view.query.find(_.bind(this.match_facet, this));
+ if (!facet) { return; }
+ facet.values.each(function (v) {
+ var i = _(self.filters).indexOf(v.get('value'));
+ if (i === -1) { return; }
+ $filters.eq(i).addClass('oe_selected');
+ });
+ },
+ /**
+ * Matches the group to a facet, in order to find if the group is
+ * represented in the current search query
+ */
+ match_facet: function (facet) {
+ return facet.get('field') === this;
+ },
make_facet: function (values) {
return {
category: _t("Filter"),
@@ -1130,7 +1155,7 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
this._super(filters, view);
// Not flanders: facet unicity is handled through the
// (category, field) pair of facet attributes. This is all well and
- // good for regular filter groups where a group matche a facet, but for
+ // good for regular filter groups where a group matches a facet, but for
// groupby we want a single facet. So cheat: add an attribute on the
// view which proxies to the first GroupbyGroup, so it can be used
// for every GroupbyGroup and still provides the various methods needed
@@ -1144,6 +1169,9 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({
}
}
},
+ match_facet: function (facet) {
+ return facet.get('field') === this.getParent()._s_groupby;
+ },
make_facet: function (values) {
return {
category: _t("GroupBy"),