summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/chrome/action_manager_act_window.js
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src/js/chrome/action_manager_act_window.js')
-rw-r--r--addons/web/static/src/js/chrome/action_manager_act_window.js20
1 files changed, 16 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 4bf2d4f22fb..cbf6d977ce1 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
@@ -47,7 +47,10 @@ ActionManager.include({
* @param {string} [state.view_type]
*/
loadState: function (state) {
+ var callersArguments = arguments;
+ var self = this;
var action;
+ var def;
var options = {
clear_breadcrumbs: true,
pushState: false,
@@ -102,11 +105,20 @@ ActionManager.include({
action = lastAction;
options.viewType = state.view_type;
}
+ } else if (state.sa) {
+ def = this._rpc({
+ route: '/web/session/get_session_action',
+ params: {key: state.sa},
+ }).then(function (sessionAction) {
+ action = sessionAction;
+ });
}
- if (action) {
- return this.doAction(action, options);
- }
- return this._super.apply(this, arguments);
+ return $.when(def).then(function () {
+ if (action) {
+ return self.doAction(action, options);
+ }
+ return self._super.apply(self, callersArguments);
+ });
},
//--------------------------------------------------------------------------