diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-19 18:25:41 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-19 18:25:41 +0100 |
| commit | 82effcca83ddc7ebb69c68ff5a68ad401d3b9643 (patch) | |
| tree | 0af576b4ad82cb8d0896c6963abdeb0428b54fce /addons/website/static/src | |
| parent | 0e898eae3506e1e4a6407e11097b58a60c6d7321 (diff) | |
| parent | caf6b4a7c7909349ab7c8f2e10bf86f5a9ff2a20 (diff) | |
[MERGE] forward port branch 10.0 up to caf6b4a7c79
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/website.backendDashboard.js | 5 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.backend.xml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/addons/website/static/src/js/website.backendDashboard.js b/addons/website/static/src/js/website.backendDashboard.js index 18307bba466..c3f2ef2ebfb 100644 --- a/addons/website/static/src/js/website.backendDashboard.js +++ b/addons/website/static/src/js/website.backendDashboard.js @@ -174,6 +174,10 @@ var Dashboard = Widget.extend(ControlPanelMixin, { $analytics_components.empty(); // 1. Authorize component var $analytics_auth = $('<div>').addClass('col-md-12'); + window.onOriginError = function () { + $analytics_components.find('.js_unauthorized_message').remove(); + self.display_unauthorized_message($analytics_components, 'not_initialized'); + }; gapi.analytics.auth.authorize({ container: $analytics_auth[0], clientid: client_id @@ -182,6 +186,7 @@ var Dashboard = Widget.extend(ControlPanelMixin, { self.handle_analytics_auth($analytics_components); gapi.analytics.auth.on('signIn', function() { + delete window.onOriginError; self.handle_analytics_auth($analytics_components); }); diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index ad7c4715378..d8db38684b7 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -38,6 +38,7 @@ <div t-name="website.unauthorized_analytics" class="col-xs-12 js_unauthorized_message mb16"> <span t-if="reason === 'not_connected'">You need to log in to your Google Account before: </span> <span t-if="reason === 'no_right'">You do not seem to have access to this Analytics Account.</span> + <span t-if="reason === 'not_initialized'">Google Analytics initialization failed. Maybe this domain is not whitelisted in your Google Analytics project for this client ID.</span> </div> <div t-name="website.ga_dialog_content"> |