diff options
| author | TWA <twa@odoo.com> | 2018-09-28 16:09:43 +0200 |
|---|---|---|
| committer | Rémi Rahir <rar@odoo.com> | 2018-09-29 11:30:21 +0200 |
| commit | 73f0cc21ceff5e86528b05fe2efb80f48c5e43dd (patch) | |
| tree | ba9dcb1c7dadb90a697749217b6fa98deb53381d | |
| parent | c51d4c2d058dcb03148e741f78ca8ba8650f02cf (diff) | |
[FIX] partner_autocomplete: Enrich data even if get logo returns error
| -rw-r--r-- | addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js | 8 |
1 files changed, 7 insertions, 1 deletions
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 |