summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/search_inputs.js
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2016-04-21 13:58:22 +0200
committerGéry Debongnie <ged@odoo.com>2016-04-21 15:21:42 +0200
commit6768bbfcc02e0f498110cda2ba9adbc2fd23d24c (patch)
tree7dccb1019434582874b285276189b1b3dcbb96a9 /addons/web/static/src/js/views/search_inputs.js
parente1bfd3fbda97ac7a64a585b07be161d5be606cf9 (diff)
parent8e440b173e3b273b3aac541f2ec12527f67dfa60 (diff)
[MERGE] *: stop duplicating web
Avoid duplicating web addon in enterprise by extracting a common basis. Enterprise features stay in enterprise, but use that common basis. In web, mainly: - JS refactoring and linting - Conversion of .sass into .less split into multiple files - Templates cleaning and DOM simplification - Re-generation of web.pot, and update of .po files Minor tweaks in some other addons to make them work with this new structure.
Diffstat (limited to 'addons/web/static/src/js/views/search_inputs.js')
-rw-r--r--addons/web/static/src/js/views/search_inputs.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/web/static/src/js/views/search_inputs.js b/addons/web/static/src/js/views/search_inputs.js
index 44b79999259..0263f270172 100644
--- a/addons/web/static/src/js/views/search_inputs.js
+++ b/addons/web/static/src/js/views/search_inputs.js
@@ -541,6 +541,7 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{
return {
category: _t("Filter"),
icon: this.icon,
+ separator: _t(" or "),
values: values,
field: this
};
@@ -617,6 +618,7 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{
});
},
toggle_filter: function (e) {
+ e.preventDefault();
e.stopPropagation();
this.toggle(this.filters[Number($(e.target).parent().data('index'))]);
},
@@ -686,6 +688,7 @@ var GroupbyGroup = FilterGroup.extend({
return {
category: _t("Group By"),
icon: this.icon,
+ separator: " > ",
values: values,
field: this.searchview._s_groupby
};