[MERGE] forward port branch saas-12.1 up to 8aa8548d8ab

2 files changed, 6 insertions, 6 deletions

diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js
index c798189c0a0..107c6e314eb 100644
--- a/addons/web/static/src/js/chrome/action_manager.js
+++ b/addons/web/static/src/js/chrome/action_manager.js
@@ -332,9 +332,6 @@ var ActionManager = Widget.extend({
                 // update the internal state and the DOM
                 self._pushController(controller);
 
-                // toggle the fullscreen mode for actions in target='fullscreen'
-                self._toggleFullscreen();
-
                 // store the action into the sessionStorage so that it can be
                 // fully restored on F5
                 self.call('session_storage', 'setItem', 'current_action', action._originalAction);
@@ -720,6 +717,9 @@ var ActionManager = Widget.extend({
             action: this.getCurrentAction(),
             controller: controller,
         });
+
+        // toggle the fullscreen mode for actions in target='fullscreen'
+        this._toggleFullscreen();
     },
     /**
      * Pushes the given state, with additional information about the given
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 1a688ffa6b2..106f9f2aa47 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
@@ -93,7 +93,7 @@ ActionManager.include({
                 action = state.action;
                 options = _.extend(options, {
                     additional_context: context,
-                    resID: state.id,
+                    resID: state.id || undefined,  // empty string with bbq
                     viewType: state.view_type,
                 });
             }
@@ -396,7 +396,7 @@ ActionManager.include({
         var inline = action.target === 'inline';
         var options = {
             action_id: action.id,
-            toolbar: inDialog && inline,
+            toolbar: !inDialog && !inline,
         };
         var views = action.views.slice();
         if (!inline && !(inDialog && action.views[0][1] === 'form')) {
@@ -635,7 +635,7 @@ ActionManager.include({
                     _.object(_.reject(_.pairs(env.context), function (pair) {
                         return pair[0].match('^(?:(?:default_|search_default_|show_).+|' +
                                              '.+_view_ref|group_by|group_by_no_leaf|active_id|' +
-                                             'active_ids)$') !== null;
+                                             'active_ids|orderedBy)$') !== null;
                     }))
                 );
                 ctx.add(actionData.context || {});