Browse Source

Merge pull request #545 from Horanet/10.0-mig-web_search_with_and

[10.0][MIG] Migrate web_search_with_and from 8.0 to 10.0
pull/589/head
Dave Lasley 8 years ago
committed by GitHub
parent
commit
820f8665aa
  1. 61
      web_search_with_and/README.rst
  2. 1
      web_search_with_and/__init__.py
  3. 20
      web_search_with_and/__manifest__.py
  4. 8
      web_search_with_and/data/data.xml
  5. BIN
      web_search_with_and/static/description/icon.png
  6. 55
      web_search_with_and/static/src/js/search.js

61
web_search_with_and/README.rst

@ -0,0 +1,61 @@
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
====================================
Use AND conditions on omnibar search
====================================
When searching for records on same field Odoo joins multiple queries with OR.
For example:
* Perform a search for customer "John" on field Name
* Odoo displays customers containing "John"
* Search for "Smith" on same field Name
* Odoo displays customers containing "John" OR "Smith"
With this module installed you can press Shift key before searching for "Smith"
and Odoo finds customers containing "John" AND "Smith"
Usage
=====
* Enter your value in omnibar search field
* Press and hold Shift key
* Select field with mouse or keyboard to perform search on
.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/162/10.0
Bug Tracker
===========
Bugs are tracked on `GitHub Issues
<https://github.com/OCA/{project_repo}/issues>`_. In case of trouble, please
check there if your issue has already been reported. If you spotted it first,
help us smash it by providing detailed and welcomed feedback.
Credits
=======
Contributors
------------
* Andrius Preimantas <andrius@versada.lt>
* Adrien Didenot <adrien.didenot@horanet.com>
Maintainer
----------
.. image:: http://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: http://odoo-community.org
This module is maintained by the OCA.
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.
To contribute to this module, please visit http://odoo-community.org.

1
web_search_with_and/__init__.py

@ -0,0 +1 @@
# -*- coding: utf-8 -*-

20
web_search_with_and/__manifest__.py

@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Copyright 2015 Andrius Preimantas <andrius@versada.lt>
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
'name': "Use AND conditions on omnibar search",
'version': '10.0.1.0.0',
'author': 'Versada UAB, Odoo Community Association (OCA)',
'license': 'AGPL-3',
'category': 'web',
'website': 'http://www.versada.lt',
'depends': [
'web',
],
'data': [
'data/data.xml',
],
'installable': True,
'application': False,
}

8
web_search_with_and/data/data.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="assets_backend" name="web_view_editor assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/web_search_with_and/static/src/js/search.js"/>
</xpath>
</template>
</odoo>

BIN
web_search_with_and/static/description/icon.png

After

Width: 128  |  Height: 128  |  Size: 9.2 KiB

55
web_search_with_and/static/src/js/search.js

@ -0,0 +1,55 @@
odoo.define('web_search_with_and', function (require) {
"use strict";
var SearchView = require('web.SearchView');
var Backbone = window.Backbone;
SearchView.include({
// Override the base method to detect a 'shift' event
select_completion: function (e, ui) {
if (e.shiftKey
&& ui.item.facet.values
&& ui.item.facet.values.length
&& String(ui.item.facet.values[0].value).trim() !== "") {
// In case of an 'AND' search a new facet is added regarding of the previous facets
e.preventDefault();
this.query.add(ui.item.facet, {shiftKey: true});
} else {
return this._super.apply(this, arguments);
}
}
});
SearchView.SearchQuery.prototype = SearchView.SearchQuery.extend({
// Override the odoo method to (conditionally) add a search facet even if a existing
// facet for the same field/category already exists.
// The prototype is used to override the 'add' function in order to execute the
// following code before the Odoo native override (trick)
add: function (values, options) {
options = options || {};
if (options.shiftKey) {
if (!values) {
values = [];
}
else if (!(values instanceof Array)) {
values = [values];
}
delete options.shiftKey;
_(values).each(function (value) {
var model = this._prepareModel(value, options);
Backbone.Collection.prototype.add.call(this, model, options);
}, this);
return this;
}
else {
return this.constructor.__super__.add.call(this, values, options);
}
}
}).prototype;
});
Loading…
Cancel
Save