[MERGE] forward port branch saas-11.4 up to dabe59df9c8

2 files changed, 4 insertions, 4 deletions

diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js
index 2490cf0da57..fbf281632b4 100644
--- a/addons/web/static/src/js/chrome/action_manager_act_window.js
+++ b/addons/web/static/src/js/chrome/action_manager_act_window.js
@@ -715,7 +715,7 @@ ActionManager.include({
 
         // determine the action to execute according to the actionData
         if (actionData.special) {
-            def = $.when({type: 'ir.actions.act_window_close'});
+            def = $.when({type: 'ir.actions.act_window_close', infos: 'special'});
         } else if (actionData.type === 'object') {
             // call a Python Object method, which may return an action to execute
             var args = recordID ? [[recordID]] : [env.resIDs];
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 b4d00b6bb76..5767969d15c 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -612,12 +612,12 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
         }).then(function (result) {
             self.do_action(result, {
                 on_reverse_breadcrumb: function () {
-                    if (self.renderer.alertFields.length) {
+                    if (!_.isEmpty(self.renderer.alertFields)) {
                         self.renderer.displayTranslationAlert();
                     }
-                    return false
+                    return false;
                 },
-            })
+            });
         });
     },
 });