[MERGE] forward port branch saas-11.4 up to 6c103589c15

6 files changed, 26 insertions, 23 deletions

diff --git a/addons/web/static/src/js/chrome/abstract_web_client.js b/addons/web/static/src/js/chrome/abstract_web_client.js
index 7a8b3ce8b01..68f35f272da 100644
--- a/addons/web/static/src/js/chrome/abstract_web_client.js
+++ b/addons/web/static/src/js/chrome/abstract_web_client.js
@@ -187,7 +187,9 @@ var AbstractWebClient = Widget.extend(ServiceProviderMixin, KeyboardNavigationMi
             // If it is not handled, we should display something clearer than the common crash_manager error dialog
             // since it won't show anything except "Script error."
             // This link will probably explain it better: https://blog.sentry.io/2016/05/17/what-is-script-error.html
-            if (message === "Script error." && !file && !line && !col && !error) {
+            if (!file && !line && !col) {
+                // Chrome and Opera set "Script error." on the `message` and hide the `error`
+                // Firefox handles the "Script error." directly. It sets the error thrown by the CORS file into `error`
                 if (window.onOriginError) {
                     window.onOriginError();
                     delete window.onOriginError;
@@ -195,7 +197,7 @@ var AbstractWebClient = Widget.extend(ServiceProviderMixin, KeyboardNavigationMi
                     crash_manager.show_error({
                         type: _t("Odoo Client Error"),
                         message: _t("Unknown CORS error"),
-                        data: {debug: _t("An unknown CORS error occured. The error probably originates from a JavaScript file served from a different origin.")},
+                        data: {debug: _t("An unknown CORS error occured. The error probably originates from a JavaScript file served from a different origin. (Opening your browser console might give you a hint on the error.)")},
                     });
                 }
             } else {
diff --git a/addons/web/static/src/js/core/ajax.js b/addons/web/static/src/js/core/ajax.js
index 45313b99428..f844cbdaed4 100644
--- a/addons/web/static/src/js/core/ajax.js
+++ b/addons/web/static/src/js/core/ajax.js
@@ -46,7 +46,7 @@ function genericJsonRpc (fct_name, params, settings, fct) {
     });
     // FIXME: jsonp?
     deferred.abort = function () {
-        deferred.reject('communication', $.Event(), 'abort', 'abort');
+        deferred.reject({message: "XmlHttpRequestError abort"}, $.Event('abort'));
         if (xhr.abort) {
             xhr.abort();
         }
diff --git a/addons/web/static/src/js/core/session.js b/addons/web/static/src/js/core/session.js
index fcbc5872be0..694285cccdc 100644
--- a/addons/web/static/src/js/core/session.js
+++ b/addons/web/static/src/js/core/session.js
@@ -344,9 +344,9 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
             }
         };
 
-        return deferred.then(function () {
+        var promise = deferred.then(function () {
             if (aborted) {
-                var def = $.Deferred().reject('communication', $.Event(), 'abort', 'abort');
+                var def = $.Deferred().reject({message: "XmlHttpRequestError abort"}, $.Event('abort'));
                 def.abort = function () {};
                 return def;
             }
@@ -376,6 +376,9 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
             xhrDef = fct(url, "call", params, options);
             return xhrDef;
         });
+
+        promise.abort = deferred.abort;
+        return promise;
     },
     url: function (path, params) {
         params = _.extend(params || {});
diff --git a/addons/web/static/src/js/services/ajax_service.js b/addons/web/static/src/js/services/ajax_service.js
index bf754792932..0cecaae9da3 100644
--- a/addons/web/static/src/js/services/ajax_service.js
+++ b/addons/web/static/src/js/services/ajax_service.js
@@ -7,17 +7,20 @@ var session = require('web.session');
 
 var AjaxService = AbstractService.extend({
     rpc: function (route, args, options, target) {
-        return $.Deferred(function (def) {
-            session.rpc(route, args, options).then(function () {
-                if (!target.isDestroyed()) {
-                    def.resolve.apply(def, arguments);
-                }
-            }, function () {
-                if (!target.isDestroyed()) {
-                    def.reject.apply(def, arguments);
-                }
-            });
-        }).promise();
+        var def = $.Deferred();
+        var promise = def.promise();
+        var xhrDef = session.rpc(route, args, options);
+        promise.abort = xhrDef.abort.bind(xhrDef);
+        xhrDef.then(function () {
+            if (!target.isDestroyed()) {
+                def.resolve.apply(def, arguments);
+            }
+        }).fail(function () {
+            if (!target.isDestroyed()) {
+                def.reject.apply(def, arguments);
+            }
+        });
+        return promise;
     },
 });
 
diff --git a/addons/web/static/src/js/views/kanban/kanban_model.js b/addons/web/static/src/js/views/kanban/kanban_model.js
index 9c0bcdf37fe..905ea05ac1e 100644
--- a/addons/web/static/src/js/views/kanban/kanban_model.js
+++ b/addons/web/static/src/js/views/kanban/kanban_model.js
@@ -61,15 +61,11 @@ var KanbanModel = BasicModel.extend({
         if (!groupByField || groupByField.type !== 'many2one') {
             return $.Deferred().reject(); // only supported when grouped on m2o
         }
-        // ignore action default which may be for another model
-        var context = _.pick(parent.context, function (value, key) {
-            return key.slice(0,8) !== 'default_';
-        });
         return this._rpc({
                 model: groupByField.relation,
                 method: 'name_create',
                 args: [name],
-                context: context, // todo: combine with view context
+                context: parent.context, // todo: combine with view context
             })
             .then(function (result) {
                 var newGroup = self._makeDataPoint({
diff --git a/addons/web/static/src/js/views/list/list_renderer.js b/addons/web/static/src/js/views/list/list_renderer.js
index b343f044bc2..15c3e24116f 100644
--- a/addons/web/static/src/js/views/list/list_renderer.js
+++ b/addons/web/static/src/js/views/list/list_renderer.js
@@ -200,6 +200,7 @@ var ListRenderer = BasicRenderer.extend({
                 reject = columnInvisibleFields[c.attrs.name];
             }
             if (!reject && c.attrs.widget === 'handle') {
+                self.hasHandle = true;
                 self.handleField = c.attrs.name;
             }
             return reject;
@@ -663,8 +664,6 @@ var ListRenderer = BasicRenderer.extend({
         this._computeAggregates();
         $table.toggleClass('o_list_view_grouped', this.isGrouped);
         $table.toggleClass('o_list_view_ungrouped', !this.isGrouped);
-        this.hasHandle = this.state.orderedBy.length === 0 ||
-            this.state.orderedBy[0].name === this.handleField;
         if (this.isGrouped) {
             $table
                 .append(this._renderHeader(true))