[IMP] base_name_search_improved: add v12 imp
Juan Jose Scarafia
filoquin
parent
21daec5241
commit
bebd42a4a2
|
|
@ -1,3 +1,4 @@
|
|||
# Copyright 2016 Daniel Reis
|
||||
# © 2016 Daniel Reis
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
from .hooks import uninstall_hook
|
||||
from . import models
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
# Copyright 2016 Daniel Reis
|
||||
# © 2016 Daniel Reis
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
{
|
||||
"name": "Improved Name Search",
|
||||
"summary": "Friendlier search when typing in relation fields",
|
||||
"version": "11.0.1.0.0",
|
||||
"category": "Uncategorized",
|
||||
"website": "https://github.com/OCA/server-tools",
|
||||
"author": "Daniel Reis, Odoo Community Association (OCA)",
|
||||
"license": "AGPL-3",
|
||||
"data": ["views/ir_model_views.xml",],
|
||||
"depends": ["base",],
|
||||
"installable": True,
|
||||
'name': 'Improved Name Search',
|
||||
'summary': 'Friendlier search when typing in relation fields',
|
||||
'version': '12.0.1.1.0',
|
||||
'category': 'Uncategorized',
|
||||
'website': 'https://odoo-community.org/',
|
||||
'author': 'Daniel Reis, Odoo Community Association (OCA), ADHOC SA',
|
||||
'license': 'AGPL-3',
|
||||
'data': [
|
||||
'views/ir_model_views.xml',
|
||||
],
|
||||
'depends': [
|
||||
'base',
|
||||
],
|
||||
'installable': True,
|
||||
"uninstall_hook": "uninstall_hook",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
from odoo import api, models
|
||||
import logging
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def uninstall_hook(cr, registry):
|
||||
_logger.info("Reverting Patches...")
|
||||
models.BaseModel._revert_method("fields_view_get")
|
||||
_logger.info("Done!")
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * base_name_search_improved
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: base_name_search_improved
|
||||
#: model:ir.model,name:base_name_search_improved.model_ir_model
|
||||
msgid "Models"
|
||||
msgstr ""
|
||||
|
||||
#. module: base_name_search_improved
|
||||
#: model:ir.model.fields,field_description:base_name_search_improved.field_ir_model_name_search_ids
|
||||
msgid "Name Search Fields"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * base_name_search_improved
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 8.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2016-06-17 02:42+0000\n"
|
||||
"PO-Revision-Date: 2016-06-17 02:42+0000\n"
|
||||
"Last-Translator: <>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: base_name_search_improved
|
||||
#: model:ir.model,name:base_name_search_improved.model_ir_model
|
||||
msgid "Models"
|
||||
msgstr "Models"
|
||||
|
||||
#. module: base_name_search_improved
|
||||
#: model:ir.model.fields,field_description:base_name_search_improved.field_ir_model_name_search_ids
|
||||
msgid "Name Search Fields"
|
||||
msgstr "Name Search Fields"
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Copyright 2016 Daniel Reis
|
||||
# © 2016 Daniel Reis
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
from . import ir_model
|
||||
|
|
|
|||
|
|
@ -1,76 +1,241 @@
|
|||
# Copyright 2016 Daniel Reis
|
||||
# © 2016 Daniel Reis
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models, tools
|
||||
|
||||
from odoo import models, fields, api, tools, _
|
||||
from lxml import etree
|
||||
from ast import literal_eval
|
||||
from odoo.exceptions import ValidationError
|
||||
import logging
|
||||
_logger = logging.getLogger(__name__)
|
||||
# Extended name search is only used on some operators
|
||||
ALLOWED_OPS = {"ilike", "like"}
|
||||
ALLOWED_OPS = set(['ilike', 'like'])
|
||||
|
||||
|
||||
@tools.ormcache(skiparg=0)
|
||||
def _get_rec_names(self):
|
||||
"List of fields to search into"
|
||||
model = self.env["ir.model"].search([("model", "=", self._name)])
|
||||
rec_name = [self._rec_name] if bool(self._rec_name) else []
|
||||
other_names = model.name_search_ids.mapped("name")
|
||||
model = self.env['ir.model'].search(
|
||||
[('model', '=', str(self._name))])
|
||||
rec_name = [self._rec_name] or []
|
||||
other_names = model.name_search_ids.mapped('name')
|
||||
return rec_name + other_names
|
||||
|
||||
|
||||
@tools.ormcache(skiparg=0)
|
||||
def _get_add_smart_search(self):
|
||||
"Add Smart Search on search views"
|
||||
model = self.env['ir.model'].search([('model', '=', str(self._name))])
|
||||
# Run only if module is installed
|
||||
if hasattr(model, 'add_smart_search'):
|
||||
return model.add_smart_search
|
||||
return False
|
||||
|
||||
|
||||
@tools.ormcache(skiparg=0)
|
||||
def _get_name_search_domain(self):
|
||||
"Add Smart Search on search views"
|
||||
name_search_domain = self.env['ir.model'].search(
|
||||
[('model', '=', str(self._name))]).name_search_domain
|
||||
if name_search_domain:
|
||||
return literal_eval(name_search_domain)
|
||||
return []
|
||||
|
||||
|
||||
def _extend_name_results(self, domain, results, limit):
|
||||
result_count = len(results)
|
||||
if result_count < limit:
|
||||
domain += [("id", "not in", [x[0] for x in results])]
|
||||
domain += [('id', 'not in', [x[0] for x in results])]
|
||||
recs = self.search(domain, limit=limit - result_count)
|
||||
results.extend(recs.name_get())
|
||||
return results
|
||||
|
||||
# TODO move all this to register_hook
|
||||
|
||||
|
||||
_add_magic_fields_original = models.BaseModel._add_magic_fields
|
||||
|
||||
|
||||
@api.model
|
||||
def _add_magic_fields(self):
|
||||
res = _add_magic_fields_original(self)
|
||||
|
||||
if (
|
||||
'base_name_search_improved' in self.env.registry._init_modules and
|
||||
'smart_search' not in self._fields):
|
||||
self._add_field('smart_search', fields.Char(
|
||||
automatic=True, compute='_compute_smart_search',
|
||||
search='_search_smart_search'))
|
||||
return res
|
||||
|
||||
|
||||
models.BaseModel._add_magic_fields = _add_magic_fields
|
||||
|
||||
|
||||
class IrModel(models.Model):
|
||||
_inherit = "ir.model"
|
||||
_inherit = 'ir.model'
|
||||
|
||||
name_search_ids = fields.Many2many("ir.model.fields", string="Name Search Fields")
|
||||
add_smart_search = fields.Boolean(
|
||||
help="Add Smart Search on search views",
|
||||
)
|
||||
name_search_ids = fields.Many2many(
|
||||
'ir.model.fields',
|
||||
string='Name Search Fields')
|
||||
name_search_domain = fields.Char(
|
||||
)
|
||||
|
||||
@api.constrains(
|
||||
'name_search_ids', 'name_search_domain', 'add_smart_search')
|
||||
def update_search_wo_restart(self):
|
||||
self.clear_caches()
|
||||
|
||||
@api.constrains('name_search_domain')
|
||||
def check_name_search_domain(self):
|
||||
for rec in self.filtered('name_search_domain'):
|
||||
name_search_domain = False
|
||||
try:
|
||||
name_search_domain = literal_eval(rec.name_search_domain)
|
||||
except Exception as error:
|
||||
raise ValidationError(_(
|
||||
"Couldn't eval Name Search Domain (%s)") % error)
|
||||
if not isinstance(name_search_domain, list):
|
||||
raise ValidationError(_(
|
||||
'Name Search Domain must be a list of tuples'))
|
||||
|
||||
@api.model_cr
|
||||
def _register_hook(self):
|
||||
|
||||
def make_name_search():
|
||||
|
||||
@api.model
|
||||
def name_search(self, name="", args=None, operator="ilike", limit=100):
|
||||
def name_search(self, name='', args=None,
|
||||
operator='ilike', limit=100):
|
||||
limit = limit or 0
|
||||
enabled = self.env.context.get('name_search_extended', True)
|
||||
superself = self.sudo()
|
||||
if enabled:
|
||||
# we add domain
|
||||
args = args or [] + _get_name_search_domain(superself)
|
||||
# Perform standard name search
|
||||
res = name_search.origin(
|
||||
self, name=name, args=args, operator=operator, limit=limit
|
||||
)
|
||||
enabled = self.env.context.get("name_search_extended", True)
|
||||
self, name=name, args=args, operator=operator,
|
||||
limit=limit)
|
||||
# Perform extended name search
|
||||
# Note: Empty name causes error on
|
||||
# Customer->More->Portal Access Management
|
||||
if name and enabled and operator in ALLOWED_OPS:
|
||||
# Support a list of fields to search on
|
||||
all_names = _get_rec_names(self)
|
||||
all_names = _get_rec_names(superself)
|
||||
base_domain = args or []
|
||||
# Try regular search on each additional search field
|
||||
for rec_name in all_names[1:]:
|
||||
domain = [(rec_name, operator, name)]
|
||||
res = _extend_name_results(
|
||||
self, base_domain + domain, res, limit
|
||||
)
|
||||
self, base_domain + domain, res, limit)
|
||||
# Try ordered word search on each of the search fields
|
||||
for rec_name in all_names:
|
||||
domain = [(rec_name, operator, name.replace(" ", "%"))]
|
||||
domain = [
|
||||
(rec_name, operator, name.replace(' ', '%'))]
|
||||
res = _extend_name_results(
|
||||
self, base_domain + domain, res, limit
|
||||
)
|
||||
self, base_domain + domain, res, limit)
|
||||
# Try unordered word search on each of the search fields
|
||||
for rec_name in all_names:
|
||||
domain = [(rec_name, operator, x) for x in name.split() if x]
|
||||
# we only perform this search if we have at least one
|
||||
# separator character
|
||||
# also, if have raise the limit we skeep this iteration
|
||||
if " " in name and len(res) < limit:
|
||||
domain = []
|
||||
for word in name.split():
|
||||
word_domain = []
|
||||
for rec_name in all_names:
|
||||
word_domain = (
|
||||
word_domain and ['|'] + word_domain or
|
||||
word_domain
|
||||
) + [(rec_name, operator, word)]
|
||||
domain = (
|
||||
domain and ['&'] + domain or domain
|
||||
) + word_domain
|
||||
res = _extend_name_results(
|
||||
self, base_domain + domain, res, limit
|
||||
)
|
||||
return res
|
||||
self, base_domain + domain, res, limit)
|
||||
|
||||
return res
|
||||
return name_search
|
||||
|
||||
def patch_fields_view_get():
|
||||
@api.model
|
||||
def fields_view_get(
|
||||
self, view_id=None, view_type='form', toolbar=False,
|
||||
submenu=False):
|
||||
res = fields_view_get.origin(
|
||||
self, view_id=view_id, view_type=view_type,
|
||||
toolbar=toolbar, submenu=submenu)
|
||||
if view_type == 'search' and _get_add_smart_search(self):
|
||||
eview = etree.fromstring(res['arch'])
|
||||
placeholders = eview.xpath("//search/field")
|
||||
if placeholders:
|
||||
placeholder = placeholders[0]
|
||||
else:
|
||||
placeholder = eview.xpath("//search")[0]
|
||||
placeholder.addnext(
|
||||
etree.Element('field', {'name': 'smart_search'}))
|
||||
eview.remove(placeholder)
|
||||
res['arch'] = etree.tostring(eview)
|
||||
res['fields'].update(self.fields_get(['smart_search']))
|
||||
return res
|
||||
return fields_view_get
|
||||
|
||||
@api.multi
|
||||
def _compute_smart_search(self):
|
||||
return False
|
||||
|
||||
@api.model
|
||||
def _search_smart_search(self, operator, value):
|
||||
"""
|
||||
Por ahora este método no llama a
|
||||
self.name_search(name, operator=operator) ya que este no es tan
|
||||
performante si se llama a ilimitados registros que es lo que el
|
||||
name search debe devolver. Por eso se reimplementa acá nuevamente.
|
||||
Además name_search tiene una lógica por la cual trata de devolver
|
||||
primero los que mejor coinciden, en este caso eso no es necesario
|
||||
Igualmente seguro se puede mejorar y unificar bastante código
|
||||
"""
|
||||
enabled = self.env.context.get('name_search_extended', True)
|
||||
name = value
|
||||
if name and enabled and operator in ALLOWED_OPS:
|
||||
superself = self.sudo()
|
||||
all_names = _get_rec_names(superself)
|
||||
domain = _get_name_search_domain(superself)
|
||||
for word in name.split():
|
||||
word_domain = []
|
||||
for rec_name in all_names:
|
||||
word_domain = (
|
||||
word_domain and ['|'] + word_domain or
|
||||
word_domain
|
||||
) + [(rec_name, operator, word)]
|
||||
domain = (
|
||||
domain and ['&'] + domain or domain
|
||||
) + word_domain
|
||||
return domain
|
||||
return []
|
||||
|
||||
# add methods of computed fields
|
||||
if not hasattr(models.BaseModel, '_compute_smart_search'):
|
||||
models.BaseModel._compute_smart_search = _compute_smart_search
|
||||
if not hasattr(models.BaseModel, '_search_smart_search'):
|
||||
models.BaseModel._search_smart_search = _search_smart_search
|
||||
|
||||
_logger.info('Patching fields_view_get on BaseModel')
|
||||
models.BaseModel._patch_method(
|
||||
'fields_view_get', patch_fields_view_get())
|
||||
|
||||
for model in self.sudo().search(self.ids or []):
|
||||
Model = self.env.get(model.model)
|
||||
if Model is not None:
|
||||
Model._patch_method("name_search", make_name_search())
|
||||
Model._patch_method('name_search', make_name_search())
|
||||
|
||||
return super(IrModel, self)._register_hook()
|
||||
|
||||
@api.multi
|
||||
def toggle_smart_search(self):
|
||||
""" Inverse the value of the field ``add_smart_search`` on the records
|
||||
in ``self``. """
|
||||
for record in self:
|
||||
record.add_smart_search = not record.add_smart_search
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@
|
|||
https://www.postgresql.org/docs/9.5/static/fuzzystrmatch.html
|
||||
* The list of additional fields to search could benefit from caching, for efficiency.
|
||||
* This feature could also be implemented for regular ``search`` on the ``name`` field.
|
||||
* While adding m2o or other related field that also have an improved name search, that improved name search is not used (while if name_search is customizend on a module and you add a field of that model on another model it works ok). Esto por ejemplo es en productos si agregamos campo "categoría pública" y a categoría pública le ponemos "parent_id". Entonces vamos a ver que si buscamos por una categoría padre no busca nada, en vez si hacemos esa lógica en name_search de modulo si funciona
|
||||
|
|
|
|||
|
|
@ -1,484 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
|
||||
<title>Improved Name Search</title>
|
||||
<style type="text/css">
|
||||
|
||||
/*
|
||||
:Author: David Goodger (goodger@python.org)
|
||||
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
|
||||
:Copyright: This stylesheet has been placed in the public domain.
|
||||
|
||||
Default cascading style sheet for the HTML output of Docutils.
|
||||
|
||||
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
|
||||
customize this style sheet.
|
||||
*/
|
||||
|
||||
/* used to remove borders from tables and images */
|
||||
.borderless, table.borderless td, table.borderless th {
|
||||
border: 0 }
|
||||
|
||||
table.borderless td, table.borderless th {
|
||||
/* Override padding for "table.docutils td" with "! important".
|
||||
The right padding separates the table cells. */
|
||||
padding: 0 0.5em 0 0 ! important }
|
||||
|
||||
.first {
|
||||
/* Override more specific margin styles with "! important". */
|
||||
margin-top: 0 ! important }
|
||||
|
||||
.last, .with-subtitle {
|
||||
margin-bottom: 0 ! important }
|
||||
|
||||
.hidden {
|
||||
display: none }
|
||||
|
||||
.subscript {
|
||||
vertical-align: sub;
|
||||
font-size: smaller }
|
||||
|
||||
.superscript {
|
||||
vertical-align: super;
|
||||
font-size: smaller }
|
||||
|
||||
a.toc-backref {
|
||||
text-decoration: none ;
|
||||
color: black }
|
||||
|
||||
blockquote.epigraph {
|
||||
margin: 2em 5em ; }
|
||||
|
||||
dl.docutils dd {
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Uncomment (and remove this text!) to get bold-faced definition list terms
|
||||
dl.docutils dt {
|
||||
font-weight: bold }
|
||||
*/
|
||||
|
||||
div.abstract {
|
||||
margin: 2em 5em }
|
||||
|
||||
div.abstract p.topic-title {
|
||||
font-weight: bold ;
|
||||
text-align: center }
|
||||
|
||||
div.admonition, div.attention, div.caution, div.danger, div.error,
|
||||
div.hint, div.important, div.note, div.tip, div.warning {
|
||||
margin: 2em ;
|
||||
border: medium outset ;
|
||||
padding: 1em }
|
||||
|
||||
div.admonition p.admonition-title, div.hint p.admonition-title,
|
||||
div.important p.admonition-title, div.note p.admonition-title,
|
||||
div.tip p.admonition-title {
|
||||
font-weight: bold ;
|
||||
font-family: sans-serif }
|
||||
|
||||
div.attention p.admonition-title, div.caution p.admonition-title,
|
||||
div.danger p.admonition-title, div.error p.admonition-title,
|
||||
div.warning p.admonition-title, .code .error {
|
||||
color: red ;
|
||||
font-weight: bold ;
|
||||
font-family: sans-serif }
|
||||
|
||||
/* Uncomment (and remove this text!) to get reduced vertical space in
|
||||
compound paragraphs.
|
||||
div.compound .compound-first, div.compound .compound-middle {
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
div.compound .compound-last, div.compound .compound-middle {
|
||||
margin-top: 0.5em }
|
||||
*/
|
||||
|
||||
div.dedication {
|
||||
margin: 2em 5em ;
|
||||
text-align: center ;
|
||||
font-style: italic }
|
||||
|
||||
div.dedication p.topic-title {
|
||||
font-weight: bold ;
|
||||
font-style: normal }
|
||||
|
||||
div.figure {
|
||||
margin-left: 2em ;
|
||||
margin-right: 2em }
|
||||
|
||||
div.footer, div.header {
|
||||
clear: both;
|
||||
font-size: smaller }
|
||||
|
||||
div.line-block {
|
||||
display: block ;
|
||||
margin-top: 1em ;
|
||||
margin-bottom: 1em }
|
||||
|
||||
div.line-block div.line-block {
|
||||
margin-top: 0 ;
|
||||
margin-bottom: 0 ;
|
||||
margin-left: 1.5em }
|
||||
|
||||
div.sidebar {
|
||||
margin: 0 0 0.5em 1em ;
|
||||
border: medium outset ;
|
||||
padding: 1em ;
|
||||
background-color: #ffffee ;
|
||||
width: 40% ;
|
||||
float: right ;
|
||||
clear: right }
|
||||
|
||||
div.sidebar p.rubric {
|
||||
font-family: sans-serif ;
|
||||
font-size: medium }
|
||||
|
||||
div.system-messages {
|
||||
margin: 5em }
|
||||
|
||||
div.system-messages h1 {
|
||||
color: red }
|
||||
|
||||
div.system-message {
|
||||
border: medium outset ;
|
||||
padding: 1em }
|
||||
|
||||
div.system-message p.system-message-title {
|
||||
color: red ;
|
||||
font-weight: bold }
|
||||
|
||||
div.topic {
|
||||
margin: 2em }
|
||||
|
||||
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
|
||||
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
|
||||
margin-top: 0.4em }
|
||||
|
||||
h1.title {
|
||||
text-align: center }
|
||||
|
||||
h2.subtitle {
|
||||
text-align: center }
|
||||
|
||||
hr.docutils {
|
||||
width: 75% }
|
||||
|
||||
img.align-left, .figure.align-left, object.align-left, table.align-left {
|
||||
clear: left ;
|
||||
float: left ;
|
||||
margin-right: 1em }
|
||||
|
||||
img.align-right, .figure.align-right, object.align-right, table.align-right {
|
||||
clear: right ;
|
||||
float: right ;
|
||||
margin-left: 1em }
|
||||
|
||||
img.align-center, .figure.align-center, object.align-center {
|
||||
display: block;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
table.align-center {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.align-left {
|
||||
text-align: left }
|
||||
|
||||
.align-center {
|
||||
clear: both ;
|
||||
text-align: center }
|
||||
|
||||
.align-right {
|
||||
text-align: right }
|
||||
|
||||
/* reset inner alignment in figures */
|
||||
div.align-right {
|
||||
text-align: inherit }
|
||||
|
||||
/* div.align-center * { */
|
||||
/* text-align: left } */
|
||||
|
||||
.align-top {
|
||||
vertical-align: top }
|
||||
|
||||
.align-middle {
|
||||
vertical-align: middle }
|
||||
|
||||
.align-bottom {
|
||||
vertical-align: bottom }
|
||||
|
||||
ol.simple, ul.simple {
|
||||
margin-bottom: 1em }
|
||||
|
||||
ol.arabic {
|
||||
list-style: decimal }
|
||||
|
||||
ol.loweralpha {
|
||||
list-style: lower-alpha }
|
||||
|
||||
ol.upperalpha {
|
||||
list-style: upper-alpha }
|
||||
|
||||
ol.lowerroman {
|
||||
list-style: lower-roman }
|
||||
|
||||
ol.upperroman {
|
||||
list-style: upper-roman }
|
||||
|
||||
p.attribution {
|
||||
text-align: right ;
|
||||
margin-left: 50% }
|
||||
|
||||
p.caption {
|
||||
font-style: italic }
|
||||
|
||||
p.credits {
|
||||
font-style: italic ;
|
||||
font-size: smaller }
|
||||
|
||||
p.label {
|
||||
white-space: nowrap }
|
||||
|
||||
p.rubric {
|
||||
font-weight: bold ;
|
||||
font-size: larger ;
|
||||
color: maroon ;
|
||||
text-align: center }
|
||||
|
||||
p.sidebar-title {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold ;
|
||||
font-size: larger }
|
||||
|
||||
p.sidebar-subtitle {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold }
|
||||
|
||||
p.topic-title {
|
||||
font-weight: bold }
|
||||
|
||||
pre.address {
|
||||
margin-bottom: 0 ;
|
||||
margin-top: 0 ;
|
||||
font: inherit }
|
||||
|
||||
pre.literal-block, pre.doctest-block, pre.math, pre.code {
|
||||
margin-left: 2em ;
|
||||
margin-right: 2em }
|
||||
|
||||
pre.code .ln { color: grey; } /* line numbers */
|
||||
pre.code, code { background-color: #eeeeee }
|
||||
pre.code .comment, code .comment { color: #5C6576 }
|
||||
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
|
||||
pre.code .literal.string, code .literal.string { color: #0C5404 }
|
||||
pre.code .name.builtin, code .name.builtin { color: #352B84 }
|
||||
pre.code .deleted, code .deleted { background-color: #DEB0A1}
|
||||
pre.code .inserted, code .inserted { background-color: #A3D289}
|
||||
|
||||
span.classifier {
|
||||
font-family: sans-serif ;
|
||||
font-style: oblique }
|
||||
|
||||
span.classifier-delimiter {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold }
|
||||
|
||||
span.interpreted {
|
||||
font-family: sans-serif }
|
||||
|
||||
span.option {
|
||||
white-space: nowrap }
|
||||
|
||||
span.pre {
|
||||
white-space: pre }
|
||||
|
||||
span.problematic {
|
||||
color: red }
|
||||
|
||||
span.section-subtitle {
|
||||
/* font-size relative to parent (h1..h6 element) */
|
||||
font-size: 80% }
|
||||
|
||||
table.citation {
|
||||
border-left: solid 1px gray;
|
||||
margin-left: 1px }
|
||||
|
||||
table.docinfo {
|
||||
margin: 2em 4em }
|
||||
|
||||
table.docutils {
|
||||
margin-top: 0.5em ;
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
table.footnote {
|
||||
border-left: solid 1px black;
|
||||
margin-left: 1px }
|
||||
|
||||
table.docutils td, table.docutils th,
|
||||
table.docinfo td, table.docinfo th {
|
||||
padding-left: 0.5em ;
|
||||
padding-right: 0.5em ;
|
||||
vertical-align: top }
|
||||
|
||||
table.docutils th.field-name, table.docinfo th.docinfo-name {
|
||||
font-weight: bold ;
|
||||
text-align: left ;
|
||||
white-space: nowrap ;
|
||||
padding-left: 0 }
|
||||
|
||||
/* "booktabs" style (no vertical lines) */
|
||||
table.docutils.booktabs {
|
||||
border: 0px;
|
||||
border-top: 2px solid;
|
||||
border-bottom: 2px solid;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
table.docutils.booktabs * {
|
||||
border: 0px;
|
||||
}
|
||||
table.docutils.booktabs th {
|
||||
border-bottom: thin solid;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
|
||||
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
|
||||
font-size: 100% }
|
||||
|
||||
ul.auto-toc {
|
||||
list-style-type: none }
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="document" id="improved-name-search">
|
||||
<h1 class="title">Improved Name Search</h1>
|
||||
|
||||
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! This file is generated by oca-gen-addon-readme !!
|
||||
!! changes will be overwritten. !!
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
|
||||
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/server-tools/tree/11.0/base_name_search_improved"><img alt="OCA/server-tools" src="https://img.shields.io/badge/github-OCA%2Fserver--tools-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/server-tools-11-0/server-tools-11-0-base_name_search_improved"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/149/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
|
||||
<p>Extends the name search feature to use additional, more relaxed
|
||||
matching methods, and to allow searching into configurable additional
|
||||
record fields.</p>
|
||||
<p>The name search is the lookup feature to select a related record.
|
||||
For example, selecting a Customer on a new Sales order.</p>
|
||||
<p>For example, typing “john brown” doesn’t match “John M. Brown”.
|
||||
The relaxed search also looks up for records containing all the words,
|
||||
so “John M. Brown” would be a match.
|
||||
It also tolerates words in a different order, so searching
|
||||
for “brown john” also works.</p>
|
||||
<div class="figure">
|
||||
<img alt="https://raw.githubusercontent.com/OCA/server-tools/11.0/base_name_search_improved/images/image0.png" src="https://raw.githubusercontent.com/OCA/server-tools/11.0/base_name_search_improved/images/image0.png" />
|
||||
</div>
|
||||
<p>Additionally, an Administrator can configure other fields to also lookup into.
|
||||
For example, Customers could be additionally searched by City or Phone number.</p>
|
||||
<div class="figure">
|
||||
<img alt="https://raw.githubusercontent.com/OCA/server-tools/11.0/base_name_search_improved/images/image2.png" src="https://raw.githubusercontent.com/OCA/server-tools/11.0/base_name_search_improved/images/image2.png" />
|
||||
</div>
|
||||
<p>How it works:</p>
|
||||
<p>Regular name search is performed, and the additional search logic is only
|
||||
triggered if not enough results are found.
|
||||
This way, no overhead is added on searches that would normally yield results.</p>
|
||||
<p>But if not enough results are found, then additional search methods are tried.
|
||||
The specific methods used are:</p>
|
||||
<ul class="simple">
|
||||
<li>Try regular search on each of the additional fields</li>
|
||||
<li>Try ordered word search on each of the search fields</li>
|
||||
<li>Try unordered word search on each of the search fields</li>
|
||||
</ul>
|
||||
<p>All results found are presented in that order,
|
||||
hopefully presenting them in order of relevance.</p>
|
||||
<p><strong>Table of contents</strong></p>
|
||||
<div class="contents local topic" id="contents">
|
||||
<ul class="simple">
|
||||
<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
|
||||
<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
|
||||
<li><a class="reference internal" href="#known-issues-roadmap" id="id3">Known issues / Roadmap</a></li>
|
||||
<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
|
||||
<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
|
||||
<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
|
||||
<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
|
||||
<li><a class="reference internal" href="#other-credits" id="id8">Other credits</a></li>
|
||||
<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="configuration">
|
||||
<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
|
||||
<p>The fuzzy search is automatically enabled on all Models.
|
||||
Note that this only affects typing in related fields.
|
||||
The regular <tt class="docutils literal">search()</tt>, used in the top right search box, is not affected.</p>
|
||||
<p>Additional search fields can be configured at Settings > Technical > Database > Models,
|
||||
using the “Name Search Fields” field.</p>
|
||||
<div class="figure">
|
||||
<img alt="Name Search Fields" src="https://raw.githubusercontent.com/OCA/server-tools/11.0/base_name_search_improved/images/image1.png" style="width: 600px;" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="section" id="usage">
|
||||
<h1><a class="toc-backref" href="#id2">Usage</a></h1>
|
||||
<p>Just type into any related field, such as Customer on a Sale Order.</p>
|
||||
</div>
|
||||
<div class="section" id="known-issues-roadmap">
|
||||
<h1><a class="toc-backref" href="#id3">Known issues / Roadmap</a></h1>
|
||||
<ul class="simple">
|
||||
<li>Also use fuzzy search, such as the Levenshtein distance:
|
||||
<a class="reference external" href="https://www.postgresql.org/docs/9.5/static/fuzzystrmatch.html">https://www.postgresql.org/docs/9.5/static/fuzzystrmatch.html</a></li>
|
||||
<li>The list of additional fields to search could benefit from caching, for efficiency.</li>
|
||||
<li>This feature could also be implemented for regular <tt class="docutils literal">search</tt> on the <tt class="docutils literal">name</tt> field.</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="bug-tracker">
|
||||
<h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
|
||||
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/server-tools/issues">GitHub Issues</a>.
|
||||
In case of trouble, please check there if your issue has already been reported.
|
||||
If you spotted it first, help us smashing it by providing a detailed and welcomed
|
||||
<a class="reference external" href="https://github.com/OCA/server-tools/issues/new?body=module:%20base_name_search_improved%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
|
||||
<p>Do not contact contributors directly about support or help with technical issues.</p>
|
||||
</div>
|
||||
<div class="section" id="credits">
|
||||
<h1><a class="toc-backref" href="#id5">Credits</a></h1>
|
||||
<div class="section" id="authors">
|
||||
<h2><a class="toc-backref" href="#id6">Authors</a></h2>
|
||||
<ul class="simple">
|
||||
<li>Daniel Reis</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="contributors">
|
||||
<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
|
||||
<ul class="simple">
|
||||
<li>Daniel Reis <<a class="reference external" href="https://github.com/dreispt">https://github.com/dreispt</a>></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="other-credits">
|
||||
<h2><a class="toc-backref" href="#id8">Other credits</a></h2>
|
||||
<p>The development of this module has been financially supported by:</p>
|
||||
<ul class="simple">
|
||||
<li>Odoo Community Association</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="maintainers">
|
||||
<h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
|
||||
<p>This module is maintained by the OCA.</p>
|
||||
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
|
||||
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
|
||||
mission is to support the collaborative development of Odoo features and
|
||||
promote its widespread use.</p>
|
||||
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/server-tools/tree/11.0/base_name_search_improved">OCA/server-tools</a> project on GitHub.</p>
|
||||
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright 2016 Daniel Reis
|
||||
# © 2016 Daniel Reis
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from . import test_name_search
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright 2016 Daniel Reis
|
||||
# © 2016 Daniel Reis
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo.tests.common import TransactionCase, at_install, post_install
|
||||
|
|
@ -7,49 +7,62 @@ from odoo.tests.common import TransactionCase, at_install, post_install
|
|||
@at_install(False)
|
||||
@post_install(True)
|
||||
class NameSearchCase(TransactionCase):
|
||||
|
||||
def setUp(self):
|
||||
super(NameSearchCase, self).setUp()
|
||||
phone_field = self.env.ref("base.field_res_partner_phone")
|
||||
model_partner = self.env.ref("base.model_res_partner")
|
||||
phone_field = self.env.ref('base.field_res_partner_phone')
|
||||
model_partner = self.env.ref('base.model_res_partner')
|
||||
model_partner.name_search_ids = phone_field
|
||||
self.Partner = self.env["res.partner"]
|
||||
model_partner.add_smart_search = True
|
||||
|
||||
# this use does not make muche sense but with base module we dont have
|
||||
# much models to use for tests
|
||||
model_partner.name_search_domain = "[('parent_id', '=', False)]"
|
||||
self.Partner = self.env['res.partner']
|
||||
self.partner1 = self.Partner.create(
|
||||
{"name": "Luigi Verconti", "customer": True, "phone": "+351 555 777 333"}
|
||||
)
|
||||
{'name': 'Luigi Verconti',
|
||||
'customer': True,
|
||||
'phone': '+351 555 777 333'})
|
||||
self.partner2 = self.Partner.create(
|
||||
{"name": "Ken Shabby", "customer": True, "phone": "+351 555 333 777"}
|
||||
)
|
||||
{'name': 'Ken Shabby',
|
||||
'customer': True,
|
||||
'phone': '+351 555 333 777'})
|
||||
self.partner3 = self.Partner.create(
|
||||
{
|
||||
"name": "Johann Gambolputty of Ulm",
|
||||
"supplier": True,
|
||||
"phone": "+351 777 333 555",
|
||||
}
|
||||
)
|
||||
{'name': 'Johann Gambolputty of Ulm',
|
||||
'supplier': True,
|
||||
'phone': '+351 777 333 555'})
|
||||
|
||||
def test_RelevanceOrderedResults(self):
|
||||
"""Return results ordered by relevance"""
|
||||
res = self.Partner.name_search("555 777")
|
||||
res = self.Partner.name_search('555 777')
|
||||
self.assertEqual(
|
||||
res[0][0], self.partner1.id, "Match full string honoring spaces"
|
||||
)
|
||||
res[0][0], self.partner1.id,
|
||||
'Match full string honoring spaces')
|
||||
self.assertEqual(
|
||||
res[1][0], self.partner2.id, "Match words honoring order of appearance"
|
||||
)
|
||||
res[1][0], self.partner2.id,
|
||||
'Match words honoring order of appearance')
|
||||
self.assertEqual(
|
||||
res[2][0],
|
||||
self.partner3.id,
|
||||
"Match all words, regardless of order of appearance",
|
||||
)
|
||||
res[2][0], self.partner3.id,
|
||||
'Match all words, regardless of order of appearance')
|
||||
|
||||
def test_NameSearchMustMatchAllWords(self):
|
||||
"""Must Match All Words"""
|
||||
res = self.Partner.name_search("ulm 555 777")
|
||||
res = self.Partner.name_search('ulm aaa 555 777')
|
||||
self.assertFalse(res)
|
||||
|
||||
def test_NameSearchDifferentFields(self):
|
||||
"""Must Match All Words"""
|
||||
res = self.Partner.name_search('ulm 555 777')
|
||||
self.assertEqual(len(res), 1)
|
||||
|
||||
def test_NameSearchDomain(self):
|
||||
"""Must not return a partner with parent"""
|
||||
res = self.Partner.name_search('Edward Foster')
|
||||
self.assertFalse(res)
|
||||
|
||||
def test_MustHonorDomain(self):
|
||||
"""Must also honor a provided Domain"""
|
||||
res = self.Partner.name_search("+351", args=[("supplier", "=", True)])
|
||||
res = self.Partner.name_search('+351', args=[('supplier', '=', True)])
|
||||
gambulputty = self.partner3.id
|
||||
self.assertEqual(len(res), 1)
|
||||
self.assertEqual(res[0][0], gambulputty)
|
||||
|
|
|
|||
|
|
@ -1,19 +1,117 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!-- Copyright 2016 Daniel Reis
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- © 2016 Daniel Reis
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="view_model_form" model="ir.ui.view">
|
||||
<field name="name">Add Name Searchable to Models</field>
|
||||
<field name="model">ir.model</field>
|
||||
<field name="inherit_id" ref="base.view_model_form" />
|
||||
<field name="inherit_id" ref="base.view_model_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="state" position="after">
|
||||
<field
|
||||
name="name_search_ids"
|
||||
widget="many2many_tags"
|
||||
domain="[('model_id', '=', id)]"
|
||||
/>
|
||||
<field name="add_smart_search"/>
|
||||
<field name="name_search_ids"
|
||||
widget="many2many_tags"
|
||||
domain="[('model_id', '=', id), ('store', '=', True)]"
|
||||
/>
|
||||
<field name="name_search_domain"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_model_form_new" model="ir.ui.view">
|
||||
<field name="name">view.model.form</field>
|
||||
<field name="model">ir.model</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Custom Search">
|
||||
<sheet>
|
||||
<div class="oe_button_box" name="buttons">
|
||||
<button name="toggle_smart_search" type="object" class="oe_stat_button" icon="fa-archive">
|
||||
<field name="add_smart_search" widget="boolean_button" options="{'terminology': {
|
||||
'string_true': 'Smart Active',
|
||||
'hover_true': 'Remove Smart Search',
|
||||
'string_false': 'Not Smart Search',
|
||||
'hover_false': 'Add Smart Search',
|
||||
}}"/>
|
||||
</button>
|
||||
</div>
|
||||
<div class="oe_title">
|
||||
<label for="name" class="oe_edit_only"/>
|
||||
<h1>
|
||||
<field name="name" readonly="1"/>
|
||||
</h1>
|
||||
</div>
|
||||
<group>
|
||||
<group>
|
||||
<field name="id" invisible="1"/>
|
||||
<field name="model" readonly="1"/>
|
||||
<field name="name_search_domain"/>
|
||||
</group>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Fields">
|
||||
<!-- widget="many2many_tags" -->
|
||||
<field name="name_search_ids" colspan="4" nolabel="1" domain="[('model_id', '=', id), ('store', '=', True)]">
|
||||
<tree>
|
||||
<field name="name"/>
|
||||
<field name="field_description"/>
|
||||
<field name="ttype"/>
|
||||
<field name="state" groups="base.group_no_one"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_model_tree" model="ir.ui.view">
|
||||
<field name="name">view.model.tree</field>
|
||||
<field name="model">ir.model</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="id" invisible="1"/>
|
||||
<field name="name" readonly="1"/>
|
||||
<field name="name_search_ids" widget="many2many_tags" string="Search Fields" domain="[('model_id', '=', id), ('store', '=', True)]"/>
|
||||
<field name="name_search_domain" string="Domain"/>
|
||||
<field name="add_smart_search" string="Smart Search" widget="boolean_toggle"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_model_search" model="ir.ui.view">
|
||||
<field name="name">view.model.search</field>
|
||||
<field name="model">ir.model</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<field name="id"/>
|
||||
<field name="name"/>
|
||||
<field name="model"/>
|
||||
<filter name="extra_search" string="With Custom Search" domain="[('name_search_ids', '!=', False)]"/>
|
||||
<filter name="smart_search" string="Smart Search" domain="[('add_smart_search', '=', True)]"/>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_improved_name_search" model="ir.actions.act_window">
|
||||
<field name="name">Custom Searches</field>
|
||||
<field name="res_model">ir.model</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="search_view_id" ref="view_model_search"/>
|
||||
<field name="view_ids" eval="[(5, 0, 0),
|
||||
(0, 0, {'view_mode': 'tree', 'view_id': ref('view_model_tree')}),
|
||||
(0, 0, {'view_mode': 'form', 'view_id': ref('view_model_form_new')}
|
||||
)]"/>
|
||||
<field name="context">{'search_default_extra_search': 1}</field>
|
||||
<field name="domain">[('transient', '=', False)]</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="menu_improved_name_search" name="Custom Searches"
|
||||
parent="base.menu_administration" sequence="6"
|
||||
action="action_improved_name_search"
|
||||
/>
|
||||
|
||||
</odoo>
|
||||
|
|
|
|||
Loading…
Reference in New Issue