From 51982f9199d2e2e2066507c5d1f12f72ee01facc Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Tue, 13 Nov 2018 13:45:12 +0000 Subject: [PATCH] [FIX] website: Impossible to link an analytic account Steps to reproduce the bug: - Go to Website > Dashboard > Analytics and click on "Link my analytics account" - Enter some data and save Bug: A traceback was raised: TypeError: website_set_ga_data() missing 1 required positional argument: 'website_id' opw:1905874 closes odoo/odoo#28636 --- addons/website/controllers/backend.py | 2 +- addons/website/static/src/js/backend/dashboard.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/website/controllers/backend.py b/addons/website/controllers/backend.py index da8a9118a4a..b558620a0f5 100644 --- a/addons/website/controllers/backend.py +++ b/addons/website/controllers/backend.py @@ -61,6 +61,6 @@ class WebsiteBackend(http.Controller): request.env['res.config.settings'].create({ 'google_management_client_id': ga_client_id, 'google_analytics_key': ga_analytics_key, - 'website_id': current_website, + 'website_id': current_website.id, }).execute() return True diff --git a/addons/website/static/src/js/backend/dashboard.js b/addons/website/static/src/js/backend/dashboard.js index b4fe22ba84e..1a83e8dc39a 100644 --- a/addons/website/static/src/js/backend/dashboard.js +++ b/addons/website/static/src/js/backend/dashboard.js @@ -44,6 +44,9 @@ var Dashboard = AbstractAction.extend(ControlPanelMixin, { var self = this; return $.when(ajax.loadLibs(this), this._super()).then(function() { return self.fetch_data(); + }).then(function(){ + var website = _.findWhere(self.websites, {selected: true}); + self.website_id = website ? website.id : false; }); },