summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/chrome/action_manager_act_window.js
diff options
context:
space:
mode:
authorLucas Perais (lpe) <lpe@odoo.com>2019-07-04 07:40:18 +0000
committerAaron Bohy <aab@odoo.com>2019-07-19 08:39:07 +0000
commitdd7022eccd99b5ba9688f63b517d23c405f23797 (patch)
tree2e1d786ec1527a027ac2df693f21a3d6ddb131ee /addons/web/static/src/js/chrome/action_manager_act_window.js
parent38b5a666c50d47a0efe060c031d68a2d70689dc6 (diff)
[IMP] base,web*: searchpanel in all multi record views
Before this rev. the searchpanel could only be activated in kanban views (and it was specified in the kanban arch). From now on, the searchpanel can be activated in any multi record view. It's arch is moved to the search view arch (inside the <searchpanel> tag). Task 1985921 Co-authored-by: Aaron Bohy <aab@odoo.com>
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.js5
1 files changed, 4 insertions, 1 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 c19364fa7a9..ef9273bb484 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
@@ -689,6 +689,7 @@ ActionManager.include({
};
}
var options = {on_close: ev.data.on_closed};
+ action.flags = _.extend({}, action.flags, {withSearchPanel: false});
return self.doAction(action, options).then(ev.data.on_success, ev.data.on_fail);
});
},
@@ -711,8 +712,10 @@ ActionManager.include({
// only switch to the requested view if the controller that
// triggered the request is the current controller
var action = this.actions[currentController.actionID];
+ var currentControllerState = currentController.widget.exportState();
+ action.controllerState = _.extend({}, action.controllerState, currentControllerState);
var options = {
- controllerState: currentController.widget.exportState(),
+ controllerState: action.controllerState,
currentId: ev.data.res_id,
};
if (ev.data.mode) {