From e1b68dae50a0ffd8eadeafd823acb328c429b7fe Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Thu, 16 Mar 2017 14:01:45 +0100 Subject: [FIX] web, *: fix domain building without CompoundDomain * board, google_spreadsheet Commit 8e0c7ccc77f358601b0701536fcb33842ca324a6 got rid of the CompoundDomain class but did not adapt the code correctly. - Domains have to be concatened, not regrouped in a big array - String domains have to be converted to array - "OR" joining must normalize subdomains first (add explicit "AND"s) --- addons/web/static/src/js/chrome/search_inputs.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'addons/web/static/src/js') diff --git a/addons/web/static/src/js/chrome/search_inputs.js b/addons/web/static/src/js/chrome/search_inputs.js index 41676b98e2e..aa02f9fe950 100644 --- a/addons/web/static/src/js/chrome/search_inputs.js +++ b/addons/web/static/src/js/chrome/search_inputs.js @@ -170,6 +170,7 @@ var Field = Input.extend( /** @lends instance.web.search.Field# */ { return domains[0]; } + _.each(domains, Domain.prototype.normalizeArray); var ors = _.times(domains.length - 1, _.constant("|")); return ors.concat.apply(ors, domains); } @@ -619,10 +620,14 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{ * @return {*} combined domains of the enabled filters in this group */ get_domain: function (facet) { + var userContext = this.getSession().user_context; var domains = facet.values.chain() .map(function (f) { return f.get('value').attrs.domain; }) .without('[]') .reject(_.isEmpty) + .map(function (d) { + return Domain.prototype.stringToArray(d, userContext); + }) .value(); if (!domains.length) { @@ -632,6 +637,7 @@ var FilterGroup = Input.extend(/** @lends instance.web.search.FilterGroup# */{ return domains[0]; } + _.each(domains, Domain.prototype.normalizeArray); var ors = _.times(domains.length - 1, _.constant("|")); return ors.concat.apply(ors, domains); }, -- cgit v1.2.3