Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Honor name_search additional domain

pull/2477/head
Daniel Reis 2016-07-06 14:50:37 +01:00 committed by filoquin
parent 23f1eb792d
commit 8051c95c4f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base_name_search_improved/models/ir_model.py
View File

@ -13,6 +13,7 @@ ALLOWED_OPS = set(['ilike', 'like'])
@tools.ormcache(skiparg=0) @tools.ormcache(skiparg=0)
def _get_rec_names(self): def _get_rec_names(self):
"List of fields to search into"
model = self.env['ir.model'].search( model = self.env['ir.model'].search(
[('model', '=', str(self._model))]) [('model', '=', str(self._model))])
rec_name = [self._rec_name] or [] rec_name = [self._rec_name] or []
@ -51,19 +52,23 @@ class ModelExtended(models.Model):
if enabled and operator in ALLOWED_OPS: if enabled and operator in ALLOWED_OPS:
# Support a list of fields to search on # Support a list of fields to search on
all_names = _get_rec_names(self) all_names = _get_rec_names(self)
base_domain = args or []
# Try regular search on each additional search field # Try regular search on each additional search field
for rec_name in all_names[1:]: for rec_name in all_names[1:]:
domain = [(rec_name, operator, name)] domain = [(rec_name, operator, name)]
res = _extend_name_results(self, domain, res, limit) res = _extend_name_results(
self, base_domain + domain, res, limit)
# Try ordered word search on each of the search fields # Try ordered word search on each of the search fields
for rec_name in all_names: for rec_name in all_names:
domain = [(rec_name, operator, name.replace(' ', '%'))] domain = [(rec_name, operator, name.replace(' ', '%'))]
res = _extend_name_results(self, domain, res, limit) res = _extend_name_results(
self, base_domain + domain, res, limit)
# Try unordered word search on each of the search fields # Try unordered word search on each of the search fields
for rec_name in all_names: for rec_name in all_names:
domain = [(rec_name, operator, x) domain = [(rec_name, operator, x)
for x in name.split() if x] for x in name.split() if x]
res = _extend_name_results(self, domain, res, limit) res = _extend_name_results(
self, base_domain + domain, res, limit)
return res return res
return name_search return name_search