From 73f0cc21ceff5e86528b05fe2efb80f48c5e43dd Mon Sep 17 00:00:00 2001 From: TWA Date: Fri, 28 Sep 2018 16:09:43 +0200 Subject: [PATCH] [FIX] partner_autocomplete: Enrich data even if get logo returns error --- .../static/src/js/partner_autocomplete_core.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js b/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js index 0b709021e7b..a5f4188615b 100644 --- a/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js +++ b/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js @@ -114,7 +114,13 @@ return { // Get logo var logoPromise = company.logo ? this.getCompanyLogo(company.logo) : false; - $.when(enrichPromise, logoPromise).done(function (company_data, logo_data) { + this._whenAll([enrichPromise, logoPromise]).always(function (company_data, logo_data){ + if (Array.isArray(company_data)) company_data = company_data[0]; + else company_data = {}; + + if (Array.isArray(logo_data)) logo_data = logo_data[0]; + else logo_data = ''; + if (_.isEmpty(company_data)) company_data = company; // Delete attribute to avoid "Field_changed" errors