[MERGE] Forward port of saas-12.3 to saas-12.4 up to fe4caecb59d

closes odoo/odoo#35059

Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/addons/web/static/src/js/views/abstract_controller.js b/addons/web/static/src/js/views/abstract_controller.js
index 2a27ad03e92..74e1a239790 100644
--- a/addons/web/static/src/js/views/abstract_controller.js
+++ b/addons/web/static/src/js/views/abstract_controller.js
@@ -122,8 +122,11 @@ var AbstractController = mvc.Controller.extend(ActionMixin, {
      * @override
      */
     canBeRemoved: function () {
-        // AAB: get rid of this option when on_hashchange mechanism is improved
-        return this.discardChanges(undefined, { readonlyIfRealDiscard: true });
+        // AAB: get rid of 'readonlyIfRealDiscard' option when on_hashchange mechanism is improved
+        return this.discardChanges(undefined, {
+            noAbandon: true,
+            readonlyIfRealDiscard: true,
+        });
     },
     /**
      * Discards the changes made on the record associated to the given ID, or
@@ -137,9 +140,10 @@ var AbstractController = mvc.Controller.extend(ActionMixin, {
      *
      * @param {string} [recordID]
      *        if not given, we consider all the changes made by the controller
+     * @param {Object} [options]
      * @returns {Promise} resolved if properly discarded, rejected otherwise
      */
-    discardChanges: function (recordID) {
+    discardChanges: function (recordID, options) {
         return Promise.resolve();
     },
     /**