audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #767 from Tecnativa/10.0-web_m2x_options-fix_advanced_search_compatibility

Browse Source 
[FIX] web_m2x_options: Compatibilize with web_advanced_search_x2x
This commit is contained in:
Pedro M. Baeza
2017-10-23 10:10:18 +02:00
committed by GitHub
parent 98297d7cf2 ab07a7ebc8
commit 35a5b8b95a
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
web_m2x_options/static/src/js/form.js
View File

@@ -127,12 +127,20 @@ odoo.define('web_m2x_options.web_m2x_options', function (require) {
var blacklist = this.get_search_blacklist();
this.last_query = search_val;
var search_result = this.orderer.add(dataset.name_search(
search_val,
new data.CompoundDomain(
self.build_domain(), [["id", "not in", blacklist]]),
'ilike', this.limit + 1,
self.build_context()));
function searcher (domain) {
return self.orderer.add(dataset.name_search(
search_val,
domain,
'ilike', self.limit + 1,
self.build_context()));
}
try {
var search_result = searcher(new data.CompoundDomain(
self.build_domain(), [["id", "not in", blacklist]]));
// In search views sometimes the field domain cannot be evaluated
} catch (error) {
var search_result = searcher([["id", "not in", blacklist]]);
}
if (!(self.options && (self.is_option_set(self.options.create) || self.is_option_set(self.options.create_edit)))) {
this.create_rights = this.create_rights || (function(){