diff options
| author | Géry Debongnie <ged@odoo.com> | 2016-06-10 13:07:03 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-06-13 10:43:37 +0200 |
| commit | dcc13079b7fd02d156ffc982cddfccfe684113bc (patch) | |
| tree | 92330423afbb70eb0bf52acbbbf3f68d9bde8b1b /addons/web/static/src/js/action_manager.js | |
| parent | 7e6ad941cf4ce4b67cfaceb3fef7c740e5020f77 (diff) | |
[FIX] web: action manager and modals should interact correctly
Before this commit, the action manager could in some case have a
reference of a modal dialog, even after it has been destroyed (for
example, when the "X" button has been clicked to close a modal).
Unfortunately, it has some unexpected consequences, for example, the
do_push_state method check the existence of self.dialog to update the
url.
Diffstat (limited to 'addons/web/static/src/js/action_manager.js')
| -rw-r--r-- | addons/web/static/src/js/action_manager.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js index c7f79070e8c..8d33f1ab4ac 100644 --- a/addons/web/static/src/js/action_manager.js +++ b/addons/web/static/src/js/action_manager.js @@ -691,6 +691,9 @@ var ActionManager = Widget.extend({ // underlying form view (see comments above) pre_dialog.on_close(); } + if (!pre_dialog) { + self.dialog = null; + } }; this.dialog.on("closed", null, this.dialog.on_close); this.dialog_widget = executor.widget(); |