[MERGE] forward port branch 10.0 up to 3bb022d

4 files changed, 7 insertions, 7 deletions

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index a89896939b7..630a8919a2f 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -43,7 +43,7 @@ var ViewEditor = AceCommon.ViewEditor.extend({
         var args = {
             key: $(document.documentElement).data('view-xmlid'),
             full: true,
-            bundles: !!$('script[src*=".assets_common"]').length
+            bundles: this.$('.js_include_bundles')[0].checked
         };
         return ajax
             .jsonRpc('/website/customize_template_get', 'call', args)
@@ -65,8 +65,8 @@ var ViewEditor = AceCommon.ViewEditor.extend({
             });
     },
     displayError: function () {
-        var error_message = this._super.apply(this, arguments);
-        website.error(error_message);
+        var error = this._super.apply(this, arguments);
+        website.error(error.title, error.message);
     },
     updateHash: function () {
         window.location.hash = hash + "?view=" + this.selectedViewId();
diff --git a/addons/website/static/src/js/website.backendDashboard.js b/addons/website/static/src/js/website.backendDashboard.js
index fe6e9541ac5..5caad853fcf 100644
--- a/addons/website/static/src/js/website.backendDashboard.js
+++ b/addons/website/static/src/js/website.backendDashboard.js
@@ -259,7 +259,7 @@ var Dashboard = Widget.extend(ControlPanelMixin, {
         // Check if the user is authenticated and has the right to make API calls
         if (!gapi.analytics.auth.getAuthResponse()) {
             this.display_unauthorized_message($analytics_components, 'not_connected');
-        } else if (gapi.analytics.auth.getAuthResponse() && gapi.analytics.auth.getAuthResponse().scope.indexOf('https://www.googleapis.com/auth/analytics ') === -1) {
+        } else if (gapi.analytics.auth.getAuthResponse() && gapi.analytics.auth.getAuthResponse().scope.indexOf('https://www.googleapis.com/auth/analytics') === -1) {
             this.display_unauthorized_message($analytics_components, 'no_right');
         } else {
             this.make_analytics_calls($analytics_components);
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index c765e335f7c..72a5934fcd6 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -135,9 +135,9 @@ odoo.define('website.website', function (require) {
 
     var error = function (title, message, url) {
         return new Dialog(null, {
-            title: data.data ? data.data.arguments[0] : "",
+            title: title || "",
             $content: $(qweb.render('website.error_dialog', {
-                message: data.data ? data.data.arguments[1] : data.statusText,
+                message: message || "",
                 backend_url: url,
             })),
         }).open();
diff --git a/addons/website/static/src/less/website.ui.components.less b/addons/website/static/src/less/website.ui.components.less
index 5c2aa821e13..0d75a422219 100644
--- a/addons/website/static/src/less/website.ui.components.less
+++ b/addons/website/static/src/less/website.ui.components.less
@@ -242,7 +242,7 @@ body .modal {
 }
 
 // LOGIN FORM
-.oe_login_form, .oe_signup_form {
+.oe_login_form, .oe_signup_form, .oe_reset_password_form {
     max-width: 300px;
     position: relative;
     margin: 50px auto;