diff options
Diffstat (limited to 'addons/website/static/src/js')
| -rw-r--r-- | addons/website/static/src/js/backend/dashboard.js | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/content/website_root.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/addons/website/static/src/js/backend/dashboard.js b/addons/website/static/src/js/backend/dashboard.js index d9daa81b45a..b705067543c 100644 --- a/addons/website/static/src/js/backend/dashboard.js +++ b/addons/website/static/src/js/backend/dashboard.js @@ -137,7 +137,7 @@ var Dashboard = AbstractAction.extend({ on_go_to_website: function (ev) { ev.preventDefault(); var website = _.findWhere(this.websites, {selected: true}); - window.location.href = $.param.querystring(website.domain + '/', {'fw': website.id}); + window.location.href = `/website/force/${website.id}`; }, on_save_ga_client_id: function(ga_client_id, ga_analytics_key) { diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js index 5d52902272c..c2844a49176 100644 --- a/addons/website/static/src/js/content/website_root.js +++ b/addons/website/static/src/js/content/website_root.js @@ -313,12 +313,12 @@ var WebsiteRoot = publicRootData.PublicRoot.extend(KeyboardNavigationMixin, { _onWebsiteSwitch: function (ev) { var websiteId = ev.currentTarget.getAttribute('website-id'); var websiteDomain = ev.currentTarget.getAttribute('domain'); - var url = window.location.href; + let url = `/website/force/${websiteId}`; if (websiteDomain && window.location.hostname !== websiteDomain) { - var path = window.location.pathname + window.location.search + window.location.hash; - url = websiteDomain + path; + url = websiteDomain + url; } - window.location.href = $.param.querystring(url, {'fw': websiteId}); + const path = window.location.pathname + window.location.search + window.location.hash; + window.location.href = $.param.querystring(url, {'path': path}); }, /** * @private |