diff --git a/web_advanced_search/README.rst b/web_advanced_search/README.rst index 5c7cdf09..d8624a43 100644 --- a/web_advanced_search/README.rst +++ b/web_advanced_search/README.rst @@ -14,13 +14,13 @@ Advanced search :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github - :target: https://github.com/OCA/web/tree/11.0/web_advanced_search + :target: https://github.com/OCA/web/tree/12.0/web_advanced_search :alt: OCA/web .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/web-11-0/web-11-0-web_advanced_search + :target: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_advanced_search :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/162/11.0 + :target: https://runbot.odoo-community.org/runbot/162/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -70,10 +70,6 @@ Improvements to the search view in this addon: * Use widgets ``one2many_tags`` when searching ``one2many`` fields * Use widgets ``many2many_tags`` when searching ``many2many`` fields * Allow to edit current full search using the advanced domain editor -* Allow to edit individually any facet from current search using the - advanced domain editor -* Beautiful, human-readable, domain representation when adding an - advanced filter Changelog ========= @@ -125,7 +121,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. 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 -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -161,6 +157,6 @@ 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. -This module is part of the `OCA/web `_ project on GitHub. +This module is part of the `OCA/web `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_advanced_search/__manifest__.py b/web_advanced_search/__manifest__.py index b17b84a2..645de4f9 100644 --- a/web_advanced_search/__manifest__.py +++ b/web_advanced_search/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Advanced search", - "version": "11.0.1.0.2", + "version": "12.0.1.0.0", "author": "Therp BV, " "Tecnativa, " "Odoo Community Association (OCA)", diff --git a/web_advanced_search/readme/ROADMAP.rst b/web_advanced_search/readme/ROADMAP.rst index 122e1efb..8a0a6871 100644 --- a/web_advanced_search/readme/ROADMAP.rst +++ b/web_advanced_search/readme/ROADMAP.rst @@ -8,7 +8,3 @@ Improvements to the search view in this addon: * Use widgets ``one2many_tags`` when searching ``one2many`` fields * Use widgets ``many2many_tags`` when searching ``many2many`` fields * Allow to edit current full search using the advanced domain editor -* Allow to edit individually any facet from current search using the - advanced domain editor -* Beautiful, human-readable, domain representation when adding an - advanced filter diff --git a/web_advanced_search/static/description/index.html b/web_advanced_search/static/description/index.html index 847a54b8..016003dd 100644 --- a/web_advanced_search/static/description/index.html +++ b/web_advanced_search/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/web Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/web Translate me on Weblate Try me on Runbot

More powerful and easy to use search, especially for related fields.

Table of contents

@@ -425,10 +425,6 @@ to a journal which has a user who is member of a certain group etc.

  • Use widgets one2many_tags when searching one2many fields
  • Use widgets many2many_tags when searching many2many fields
  • Allow to edit current full search using the advanced domain editor
    • -
  • Allow to edit individually any facet from current search using the -advanced domain editor
    • -
  • Beautiful, human-readable, domain representation when adding an -advanced filter
    • @@ -477,7 +473,7 @@ search as expected too.

    Bugs are tracked on GitHub Issues. 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 -feedback.

    +feedback.

    Do not contact contributors directly about support or help with technical issues.

    @@ -507,7 +503,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

    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.

    -

    This module is part of the OCA/web project on GitHub.

    +

    This module is part of the OCA/web project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    diff --git a/web_advanced_search/static/src/css/web_advanced_search.less b/web_advanced_search/static/src/css/web_advanced_search.less deleted file mode 100644 index 796a756f..00000000 --- a/web_advanced_search/static/src/css/web_advanced_search.less +++ /dev/null @@ -1,13 +0,0 @@ -.o_search_options { - .o_filters_menu { - .o_filter_condition { - max-width: inherit; - - .o_searchview_extended_prop_value { - .o_field_domain { - min-width: 30vw; - } - } - } - } -} diff --git a/web_advanced_search/static/src/js/web_advanced_search.js b/web_advanced_search/static/src/js/web_advanced_search.js index 9d16135c..35ca25bb 100644 --- a/web_advanced_search/static/src/js/web_advanced_search.js +++ b/web_advanced_search/static/src/js/web_advanced_search.js @@ -10,7 +10,7 @@ odoo.define("web_advanced_search", function (require) { var DomainSelectorDialog = require("web.DomainSelectorDialog"); var field_registry = require("web.field_registry"); var FieldManagerMixin = require("web.FieldManagerMixin"); - var FilterMenu = require("web.FilterMenu"); + var FiltersMenu = require("web.FiltersMenu"); var human_domain = require("web_advanced_search.human_domain"); var SearchView = require("web.SearchView"); var Widget = require("web.Widget"); @@ -52,7 +52,7 @@ odoo.define("web_advanced_search", function (require) { /** * Produce a filter descriptor for advanced searches. * - * @returns {Object} In the format expected by `web.FilterMenu`. + * @returns {Object} In the format expected by `web.FiltersMenu`. */ get_filter: function () { var domain_array = this.domain.toArray(); @@ -74,12 +74,12 @@ odoo.define("web_advanced_search", function (require) { }); // Add advanced search features - FilterMenu.include({ - custom_events: _.extend({}, FilterMenu.prototype.custom_events, { + FiltersMenu.include({ + custom_events: _.extend({}, FiltersMenu.prototype.custom_events, { "domain_selected": "advanced_search_commit", }), - events: _.extend({}, FilterMenu.prototype.events, { + events: _.extend({}, FiltersMenu.prototype.events, { "click .o_add_advanced_search": "advanced_search_open", }), @@ -126,7 +126,7 @@ odoo.define("web_advanced_search", function (require) { event.data.domain ); this.propositions = [proposition]; - this.commit_search(); + this._commitSearch(); }, }); diff --git a/web_advanced_search/static/src/xml/web_advanced_search.xml b/web_advanced_search/static/src/xml/web_advanced_search.xml index ed4e0bbc..8d791eaa 100644 --- a/web_advanced_search/static/src/xml/web_advanced_search.xml +++ b/web_advanced_search/static/src/xml/web_advanced_search.xml @@ -2,12 +2,10 @@ - - -
  • -
  • - Add Advanced Filter -
    • + + +