diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-10-27 17:55:47 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-10-27 17:55:47 +0200 |
| commit | 6f8e40cdecaffe70b2ed8aa91afe787c94a0a2e5 (patch) | |
| tree | a9c027f4f9f610ca7763a8249d8b8f0ef0767e56 /addons/board/static/src/js | |
| parent | 7a65ec28b931e1e89cca7b8e9392b084010207d0 (diff) | |
| parent | 1304d13c7f59ecdef46b3bd8014f5ae8fe874c45 (diff) | |
[MERGE] forward port branch saas-11 up to 1304d13
Diffstat (limited to 'addons/board/static/src/js')
| -rw-r--r-- | addons/board/static/src/js/dashboard.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 6606ffe5569..a743cb6562f 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -139,7 +139,11 @@ var DashBoard = form_common.FormWidget.extend({ }, on_close_action: function(e) { if (confirm(_t("Are you sure you want to remove this item ?"))) { - $(e.currentTarget).parents('.oe_action:first').remove(); + var $container = $(e.currentTarget).parents('.oe_action:first'); + var am = _.findWhere(this.action_managers, { am_id: $container.data('am_id') }); + am.destroy(); + this.action_managers.splice(_.indexOf(this.action_managers, am), 1); + $container.remove(); this.do_save_dashboard(); } }, @@ -223,7 +227,13 @@ var DashBoard = form_common.FormWidget.extend({ var am = new ActionManager(this), // FIXME: ideally the dashboard view shall be refactored like kanban. $action = $('#' + this.view.element_id + '_action_' + index); - $action.parent().data('action_attrs', action_attrs); + var $action_container = $action.closest('.oe_action'); + var am_id = _.uniqueId('action_manager_'); + am.am_id = am_id; + $action_container.data({ + action_attrs: action_attrs, + am_id: am_id, + }); this.action_managers.push(am); am.appendTo($action).then(function () { am.do_action(action).then(function () { |