Techsystech
/
web_techsystech
forked from Techsystech/web
3
0
Fork 0
Code Pull Requests Activity

Merge pull request #263 from hbrunn/8.0-issue222 

[FIX] disjunctions in advanced search
8.0
Pedro M. Baeza 2016-09-02 16:04:21 +02:00 committed by GitHub
parent 940b32b3ee 7c76232a18
commit d7dc1b987d
1 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
web_advanced_search_x2x/static/src/js/web_advanced_search_x2x.js
View File

@ -296,6 +296,42 @@ openerp.web_advanced_search_x2x = function(instance)
},
});
normalize_domain = function(domain)
{
// this is the js version of https://github.com/odoo/odoo/blob/8.0/openerp/osv/expression.py#L203
if(!domain.length)
{
return [(1, '=', 1)]
}
result = []
expected = 1
op_arity = {'!': 1, '&': 2, '|': 2};
_(domain).each(function(token)
{
if(expected == 0)
{
result.unshift('&');
expected = 1;
}
result.push(token);
if(_.isArray(token))
{
expected -= 1;
}
else
{
expected += (op_arity[token] || 0) - 1;
}
})
if(expected)
{
throw _.sprintf(
'This domain is syntactically not correct: %s',
domain)
}
return result;
};
instance.web.SearchView.include({
build_search_data: function()
{
@ -310,31 +346,20 @@ openerp.web_advanced_search_x2x = function(instance)
{
return;
}
var compound_domains = [], leaves = [];
var combined = [];
_.each(domain, function(leaf)
{
if(leaf instanceof instance.web.CompoundDomain)
{
compound_domains.push(leaf);
combined = combined.concat(
normalize_domain(leaf.eval()));
}
if(_.isArray(leaf))
else
{
leaves.push(leaf);
combined.push(leaf);
}
});
if(compound_domains.length)
{
var combined = new instance.web.CompoundDomain();
_.each(compound_domains, function(domain)
{
combined.add(domain.eval());
})
_.each(leaves, function(leaf)
{
combined.add([leaf])
});
result.domains[index] = combined;
}
result.domains[index] = combined;
});
return result;
},