From 7dd24ec90be6d54b6d7da00e6f337c26f5b4ec9b Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 17 Oct 2019 11:20:25 +0000 Subject: [FIX] iap, partner_autocomplete: Autocomplete without IAP account token Steps to reproduce the bug: - Go to Settings > Technical > IAP account > - Remove the access token - Go to Contact - Try to create a company called 'Proximus' and click on the autocomplete Bug: A traceback was raised because the IAP account token was not set. opw:2087607 closes odoo/odoo#39099 X-original-commit: bc6357f0b95d354afa602eecce24a3c265819101 Signed-off-by: Nicolas Martinelli (nim) --- .../i18n/partner_autocomplete.pot | 14 ++++++++++++ addons/partner_autocomplete/models/res_partner.py | 2 ++ .../static/src/js/partner_autocomplete_core.js | 25 ++++++++++++++++++++++ .../static/src/xml/partner_autocomplete.xml | 4 ++++ 4 files changed, 45 insertions(+) (limited to 'addons/partner_autocomplete') diff --git a/addons/partner_autocomplete/i18n/partner_autocomplete.pot b/addons/partner_autocomplete/i18n/partner_autocomplete.pot index 54e4abc1b64..b071cd8959c 100644 --- a/addons/partner_autocomplete/i18n/partner_autocomplete.pot +++ b/addons/partner_autocomplete/i18n/partner_autocomplete.pot @@ -90,6 +90,13 @@ msgid "" " Employees:" msgstr "" +#. module: partner_autocomplete +#. openerp-web +#: code:addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js:0 +#, python-format +msgid "IAP Account Token missing" +msgstr "" + #. module: partner_autocomplete #: model:ir.model.fields,field_description:partner_autocomplete.field_res_partner__additional_info #: model:ir.model.fields,field_description:partner_autocomplete.field_res_users__additional_info @@ -213,6 +220,13 @@ msgstr "" msgid "Searching Autocomplete..." msgstr "" +#. module: partner_autocomplete +#. openerp-web +#: code:addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml:0 +#, python-format +msgid "Set Your Account Token" +msgstr "" + #. module: partner_autocomplete #: model_terms:ir.ui.view,arch_db:partner_autocomplete.additional_info_template msgid "Twitter :" diff --git a/addons/partner_autocomplete/models/res_partner.py b/addons/partner_autocomplete/models/res_partner.py index 1180b3039df..3be8ce1dd8c 100644 --- a/addons/partner_autocomplete/models/res_partner.py +++ b/addons/partner_autocomplete/models/res_partner.py @@ -87,6 +87,8 @@ class ResPartner(models.Model): return False, 'Insufficient Credit' url = '%s/%s' % (self.get_endpoint(), action) account = self.env['iap.account'].get('partner_autocomplete') + if not account.account_token: + return False, 'No Account Token' params.update({ 'db_uuid': self.env['ir.config_parameter'].sudo().get_param('database.uuid'), 'account_token': account.account_token, 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 288b942b1dd..bc35c58f538 100644 --- a/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js +++ b/addons/partner_autocomplete/static/src/js/partner_autocomplete_core.js @@ -141,6 +141,11 @@ var PartnerAutocompleteMixin = { company_data = company; } + if (company_data.error && company_data.error_message === 'No Account Token') { + self._notifyAccountToken(); + company_data = company; + } + if (_.isEmpty(company_data)) { company_data = company; } @@ -326,6 +331,26 @@ var PartnerAutocompleteMixin = { self.do_notify(title, content, false, 'o_partner_autocomplete_no_credits_notify'); }); }, + + _notifyAccountToken: function () { + var self = this; + return this._rpc({ + model: 'iap.account', + method: 'get_config_account_url', + args: [] + }).then(function (url) { + var title = _t('IAP Account Token missing'); + if (url){ + var content = Qweb.render('partner_autocomplete.account_token', { + account_url: url + }); + self.do_notify(title, content, false, 'o_partner_autocomplete_no_credits_notify'); + } + else { + self.do_notify(title); + } + }); + }, }; return PartnerAutocompleteMixin; diff --git a/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml b/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml index 6020e9537cc..6f545f29595 100644 --- a/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml +++ b/addons/partner_autocomplete/static/src/xml/partner_autocomplete.xml @@ -20,4 +20,8 @@
Buy more credits
+ +
+ Set Your Account Token +
-- cgit v1.2.3