audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[MIG] web_advanced_search: Migrate to v12

Browse Source
This commit is contained in:
Jairo Llopis
2019-02-18 10:17:39 +00:00
committed by Ivàn Todorovich
parent 26d641f207
commit cbecd4f9a8
8 changed files with 19 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
web_advanced_search/static/src/css/web_advanced_search.less
View File

@@ -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;
}
}
}
}
}

12
web_advanced_search/static/src/js/web_advanced_search.js
View File

@@ -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();
},
});

10
web_advanced_search/static/src/xml/web_advanced_search.xml
View File

@@ -2,12 +2,10 @@
<!-- Copyright 2017-2018 Jairo Llopis <jairo.llopis@tecnativa.com>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<templates>
<t t-extend="SearchView.FilterMenu">
<t t-jquery=".o_filters_menu" t-operation="append">
<li class="divider"/>
<li>
<a class="o_add_advanced_search">Add Advanced Filter</a>
</li>
<t t-extend="FiltersMenuGenerator">
<t t-jquery=".o_add_filter_menu" t-operation="after">
<div role="separator" class="dropdown-divider"/>
<a class="dropdown-item o_add_advanced_search">Add Advanced Filter</a>
</t>
</t>
</templates>