summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorPriyanka Kakadiya <pka@odoo.com>2019-09-17 06:56:39 +0000
committerAlexandre Kühn <aku@odoo.com>2019-09-27 14:45:51 +0000
commit9b57bfb6a2dcceaa224a64ff8dcfbe7bc6993b1e (patch)
tree9afdd9146a99b459019cf5b45671ae9a21c1ad5c /addons/web/static
parent69bf106a47592d7f868a54b18f8f80ee0491a457 (diff)
[FIX] web, *: button special not working to close dialog
*: event_sale mail sale_product_connfigurator stock Before this commit: if we open dialog from acitivity view and try to discard it (i.e. close it), it throws traceback. Issue arises from following commits: https://github.com/odoo/odoo/commit/d3d576cf8ec9e5b5f6ae5f9d8845cf384435f12d https://github.com/odoo/odoo/commit/3210f108272be89f1a7b01f4e1816b7f04ae0a3b Previously, special attribute was passed directly, but now `on_close` gets action info as an object. After this commit, it passes special key as an object for `on_close`, also changed special action based logic in other modules. Task-Id 2072181 closes odoo/odoo#37078 Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com> Co-authored-by: Mohammed Shekha <msh@odoo.com>
Diffstat (limited to 'addons/web/static')
-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 6027e21bb42..8034a8e54b8 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
@@ -616,7 +616,10 @@ ActionManager.include({
// determine the action to execute according to the actionData
if (actionData.special) {
- def = Promise.resolve({type: 'ir.actions.act_window_close', infos: 'special'});
+ def = Promise.resolve({
+ type: 'ir.actions.act_window_close',
+ infos: { special: true },
+ });
} else if (actionData.type === 'object') {
// call a Python Object method, which may return an action to execute
var args = recordID ? [[recordID]] : [env.resIDs];