pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] google_account: log error message on screen

Browse Source 
Include the Google Error message in the error message showed on screen.

Fine tuning of da13c70484 : missing transiflex translations, empty body,
wrong string format.

opw-1966309

closes odoo/odoo#33216

Signed-off-by: Lucas Perais (lpe) <lpe@odoo.com>
This commit is contained in:
Julien Castiaux
2019-05-16 09:51:41 +00:00
parent 7aa74c0f22
commit 9c369a4485
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/google_account/i18n/google_account.pot
+8 -2
View File
@@ -30,6 +30,12 @@ msgstr ""
msgid "Display Name"
msgstr ""
#. module: google_account
#: code:addons/google_account/models/google_service.py:196
#, python-format
msgid "Error while requesting Google Services: %s"
msgstr ""
#. module: google_account
#: model:ir.model,name:google_account.model_google_service
msgid "Google Service"
@@ -80,9 +86,9 @@ msgid "Something went wrong during your token generation. Maybe your Authorizati
msgstr ""
#. module: google_account
#: code:addons/google_account/models/google_service.py:193
#: code:addons/google_account/models/google_service.py:197
#, python-format
msgid "Something went wrong with your request to google"
msgid "Something went wrong with your request to google: %s"
msgstr ""
#. module: google_account
addons/google_account/models/google_service.py
+3 -3
View File
@@ -189,12 +189,12 @@ class GoogleService(models.TransientModel):
status = error.response.status_code
response = ""
else:
req = json.loads(error.request.body)
req = json.loads(error.request.body or 'null')
res = error.response.json()
_logger.exception("Error while requesting Google Services\nRequest:\n%s\nResponse:\n%s", pformat(req), pformat(res))
if error.response.status_code in (400, 401, 410):
raise UserError(_("Error while requesting Google Services: %s" % res['error']['message']))
raise self.env['res.config.settings'].get_config_warning(_("Something went wrong with your request to google"))
raise UserError(_("Error while requesting Google Services: %s") % res['error']['message'])
raise self.env['res.config.settings'].get_config_warning(_("Something went wrong with your request to google: %s") % res['error']['message'])
return (status, response, ask_time)
# TODO : remove me, it is only used in google calendar. Make google_calendar use the constants