diff options
Diffstat (limited to 'addons/web/static/src/js/chrome/action_manager.js')
| -rw-r--r-- | addons/web/static/src/js/chrome/action_manager.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js index d049abaa8ec..5c0ee9260e0 100644 --- a/addons/web/static/src/js/chrome/action_manager.js +++ b/addons/web/static/src/js/chrome/action_manager.js @@ -450,9 +450,6 @@ var ActionManager = Widget.extend({ action.controllerID = controllerID; var prom = this._executeAction(action, options); prom.then(function () { - // AAB: this should be done automatically in AbstractAction, so that - // it can be overridden by actions that have specific stuff to push - // (e.g. Discuss, Views) self._pushState(controllerID, {}); }); return prom; @@ -625,6 +622,7 @@ var ActionManager = Widget.extend({ state.active_ids = action.context.active_ids.join(','); } } + state = _.extend({}, controller.widget.getState(), state); return state; }, /** |