summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2020-07-03 15:12:36 +0000
committerAaron Bohy <aab@odoo.com>2020-07-07 10:14:54 +0000
commite55ee0bb1b285653ed23cbc8586f8c948fa7972b (patch)
treeaf505e90c2658a7c1a5e9d192ab0578315cb6617 /addons/web/static/src/js
parent5a60dbccd48fea052bf203c11d43e367b6bb4360 (diff)
[FIX] web: kanban: drag column with sample data
Before this commit, in a grouped kanban view with sample data (e.g. crm.lead), one could toggle the 'settings' dropdown menu of a group, and then drag&drop the group by clicking on the muted "Fold" item in the dropdown. After this commit, dragging a column is only possible by clicking on the column title (but not on the 'config' or '+' icons, nor the config dropdown). Task 2290197 closes odoo/odoo#54179 X-original-commit: 58c38a024c96eba3469c142a8422b7bd0ab54ea4 Signed-off-by: Mathieu Duckerts-Antoine <Polymorphe57@users.noreply.github.com> Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_column.js12
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_renderer.js2
2 files changed, 12 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/kanban/kanban_column.js b/addons/web/static/src/js/views/kanban/kanban_column.js
index 03c34b358e0..c62c8f26c15 100644
--- a/addons/web/static/src/js/views/kanban/kanban_column.js
+++ b/addons/web/static/src/js/views/kanban/kanban_column.js
@@ -29,7 +29,8 @@ var KanbanColumn = Widget.extend({
'click .o_kanban_load_more': '_onLoadMore',
'click .o_kanban_toggle_fold': '_onToggleFold',
'click .o_column_archive_records': '_onArchiveRecords',
- 'click .o_column_unarchive_records': '_onUnarchiveRecords'
+ 'click .o_column_unarchive_records': '_onUnarchiveRecords',
+ 'click .o_kanban_config .dropdown-menu': '_onConfigDropdownClicked',
},
/**
* @override
@@ -296,6 +297,15 @@ var KanbanColumn = Widget.extend({
this._cancelQuickCreate();
},
/**
+ * Prevent from closing the config dropdown when the user clicks on a
+ * disabled item (e.g. 'Fold' in sample mode).
+ *
+ * @private
+ */
+ _onConfigDropdownClicked(ev) {
+ ev.stopPropagation();
+ },
+ /**
* @private
* @param {MouseEvent} event
*/
diff --git a/addons/web/static/src/js/views/kanban/kanban_renderer.js b/addons/web/static/src/js/views/kanban/kanban_renderer.js
index cfb511ef79b..8ea7abaa7af 100644
--- a/addons/web/static/src/js/views/kanban/kanban_renderer.js
+++ b/addons/web/static/src/js/views/kanban/kanban_renderer.js
@@ -362,7 +362,7 @@ var KanbanRenderer = BasicRenderer.extend({
this.$el.sortable({
axis: 'x',
items: '> .o_kanban_group',
- handle: '.o_kanban_header_title',
+ handle: '.o_column_title',
cursor: 'move',
revert: 150,
delay: 100,