[MERGE] forward port branch 12.0 up to bc744a1da46

6 files changed, 18 insertions, 8 deletions

diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 0aff337dcbf..183885b9fb8 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -264,7 +264,9 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
                 resIDs: record.res_ids,
             },
             on_success: def.resolve.bind(def),
-            on_fail: def.reject.bind(def),
+            on_fail: function () {
+                self.update({}, {reload: false}).always(def.reject.bind(def));
+            },
             on_closed: reload,
         });
         return this.alive(def);
diff --git a/addons/web/static/src/js/views/form/form_controller.js b/addons/web/static/src/js/views/form/form_controller.js
index 7587e52fcd0..9c354be6765 100644
--- a/addons/web/static/src/js/views/form/form_controller.js
+++ b/addons/web/static/src/js/views/form/form_controller.js
@@ -49,6 +49,15 @@ var FormController = BasicController.extend({
         this._super.apply(this, arguments);
         this.autofocus();
     },
+    /**
+     * Force mode back to readonly. Whenever we leave a form view, it is saved,
+     * and should no longer be in edit mode.
+     *
+     * @override
+     */
+    willRestore: function () {
+        this.mode = 'readonly';
+    },
 
     //--------------------------------------------------------------------------
     // Public
@@ -241,7 +250,7 @@ var FormController = BasicController.extend({
      * @override
      */
     update: function (params, options) {
-        params = _.extend({viewType: 'form'}, params);
+        params = _.extend({viewType: 'form', mode: this.mode}, params);
         return this._super(params, options);
     },
 
diff --git a/addons/web/static/src/js/views/graph/graph_controller.js b/addons/web/static/src/js/views/graph/graph_controller.js
index 09992695506..27bd59e476d 100644
--- a/addons/web/static/src/js/views/graph/graph_controller.js
+++ b/addons/web/static/src/js/views/graph/graph_controller.js
@@ -179,7 +179,6 @@ var GraphController = AbstractController.extend(GroupByMenuInterfaceMixin,{
      */
     _onButtonClick: function (ev) {
         var $target = $(ev.target);
-        var parent;
         var field;
         if ($target.hasClass('o_graph_button')) {
             this._setMode($target.data('mode'));
diff --git a/addons/web/static/src/js/views/graph/graph_model.js b/addons/web/static/src/js/views/graph/graph_model.js
index adefe1e8953..26c1aec6545 100644
--- a/addons/web/static/src/js/views/graph/graph_model.js
+++ b/addons/web/static/src/js/views/graph/graph_model.js
@@ -6,11 +6,8 @@ odoo.define('web.GraphModel', function (require) {
  * server.  It basically just do a read_group and format/normalize data.
  */
 
-var core = require('web.core');
 var AbstractModel = require('web.AbstractModel');
 
-var _t = core._t;
-
 return AbstractModel.extend({
     /**
      * @override
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 fd21ed4df86..bfb6f5e0cc9 100644
--- a/addons/web/static/src/js/views/kanban/kanban_model.js
+++ b/addons/web/static/src/js/views/kanban/kanban_model.js
@@ -305,7 +305,7 @@ var KanbanModel = BasicModel.extend({
      * @override
      */
     _load: function (dataPoint, options) {
-        if (dataPoint.progressBar) {
+        if (dataPoint.groupedBy.length && dataPoint.progressBar) {
             return this._readProgressBarGroup(dataPoint, options);
         }
         return this._super.apply(this, arguments);
diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js
index d6ea10d1243..ee11afbc3bd 100644
--- a/addons/web/static/src/js/views/view_dialogs.js
+++ b/addons/web/static/src/js/views/view_dialogs.js
@@ -186,9 +186,12 @@ var FormViewDialog = ViewDialog.extend({
         }
 
         fields_view_def.then(function (viewInfo) {
+            var refinedContext = _.pick(self.context, function (value, key) {
+                return key.indexOf('_view_ref') === -1;
+            });
             var formview = new FormView(viewInfo, {
                 modelName: self.res_model,
-                context: self.context,
+                context: refinedContext,
                 ids: self.res_id ? [self.res_id] : [],
                 currentId: self.res_id || undefined,
                 index: 0,