From f9cf0baf7586298d4aa5c77b80d36b3739fd21d1 Mon Sep 17 00:00:00 2001 From: tarteo Date: Thu, 9 Jan 2020 15:25:50 +0100 Subject: [PATCH] [IMP] web_advanced_search: contains search --- web_advanced_search/__manifest__.py | 2 +- web_advanced_search/readme/CONTRIBUTORS.rst | 1 + .../static/src/js/web_advanced_search.js | 22 ++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/web_advanced_search/__manifest__.py b/web_advanced_search/__manifest__.py index 645de4f94..c0ca9df86 100644 --- a/web_advanced_search/__manifest__.py +++ b/web_advanced_search/__manifest__.py @@ -5,7 +5,7 @@ { "name": "Advanced search", - "version": "12.0.1.0.0", + "version": "12.0.1.0.1", "author": "Therp BV, " "Tecnativa, " "Odoo Community Association (OCA)", diff --git a/web_advanced_search/readme/CONTRIBUTORS.rst b/web_advanced_search/readme/CONTRIBUTORS.rst index ed3dc10c4..89b679a1f 100644 --- a/web_advanced_search/readme/CONTRIBUTORS.rst +++ b/web_advanced_search/readme/CONTRIBUTORS.rst @@ -4,3 +4,4 @@ * Rami Alwafaie * Jose MÂȘ Bernet * Simone Orsi +* Dennis Sluijk 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 35ca25bb2..856087f93 100644 --- a/web_advanced_search/static/src/js/web_advanced_search.js +++ b/web_advanced_search/static/src/js/web_advanced_search.js @@ -279,14 +279,18 @@ odoo.define("web_advanced_search", function (require) { * @override */ _applyChanges: function (dataPointID, changes, event) { - // Make char updates look like valid x2one updates - if (_.isNaN(changes[this.field.name].id)) { - changes[this.field.name] = { - id: this._fake_id--, - display_name: event.target.lastSetValue, - }; + if (this._field_widget_name === 'many2one') { + // Make char updates look like valid x2one updates + if (_.isNaN(changes[this.field.name].id)) { + changes[this.field.name] = { + id: this._fake_id--, + display_name: event.target.lastSetValue, + }; + } + return FieldManagerMixin._applyChanges.apply(this, arguments); } - return FieldManagerMixin._applyChanges.apply(this, arguments); + + return $.Deferred().resolve(); }, /** @@ -306,7 +310,7 @@ odoo.define("web_advanced_search", function (require) { case "many2one": return this._field_widget.value.res_id; default: - return this._field_widget.value.data.display_name; + return this._field_widget.$el.val(); } } catch (error) { if (error.name === "TypeError") { @@ -325,6 +329,8 @@ odoo.define("web_advanced_search", function (require) { switch (this._field_widget_name) { case "many2one": return this._field_widget.value.data.display_name; + default: + return this._field_widget.$el.val(); } return this._super.apply(this, arguments); } catch (error) {