summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorRomeo Fragomeli <rfr@odoo.com>2019-01-14 10:22:50 +0000
committerAdrien Dieudonne <adr@odoo.com>2019-01-16 11:00:38 +0000
commitc72e5a8bc5c3e7fab01f9d669c0670f40c2a95ca (patch)
tree4f0991b1f9afb430d0ad672e7f2a0eb145e77778 /addons
parent38068f8151841578fc9579aa52eb05deaff53944 (diff)
Revert "[FIX] web: empty kanban view on mobile"
Original commit breaking kanban view: 4cd379cf6ecffa00e0085a9833228128b484d48a Commit reverted: 287136b85e55b4abca03122c7b1c59099abd0854 Two fixes were added independently to fix this bug but only one is needed. odoo/enterprise@c8fe86fa225d3a5967e629f8fd35e1c92aa1fa61 best fix 287136b85e55b4abca03122c7b1c59099abd0854 other fix (now reverted) Reverting this commit fix the following bugs: - Swipe on kanban : Not able to swipe on empty column. it only works on cards - Popup activity on kanban card is unusable - On kanban separation, "Undefined" cards are before the kanban separation closes odoo/odoo#30177
Diffstat (limited to 'addons')
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js3
-rw-r--r--addons/web/static/src/scss/kanban_view_mobile.scss3
-rw-r--r--addons/web/static/tests/views/kanban_mobile_tests.js6
3 files changed, 2 insertions, 10 deletions
diff --git a/addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js b/addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js
index b7f2dd62b28..8619448e793 100644
--- a/addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js
+++ b/addons/web/static/src/js/views/kanban/kanban_renderer_mobile.js
@@ -143,7 +143,7 @@ KanbanRenderer.include({
onSuccess: function () {
// update the columns and tabs positions (optionally with an animation)
var updateFunc = animate ? 'animate' : 'css';
- self.$('.o_kanban_mobile_tab, .o_kanban_group').removeClass('o_current');
+ self.$('.o_kanban_mobile_tab').removeClass('o_current');
_.each(self.widgets, function (column, index) {
var columnID = column.id || column.db_id;
var $column = self.$('.o_kanban_group[data-id="' + columnID + '"]');
@@ -157,7 +157,6 @@ KanbanRenderer.include({
} else if (index === moveToIndex) {
$column[updateFunc]({left: '0%'});
$tab[updateFunc]({left: '50%'});
- $column.addClass('o_current');
$tab.addClass('o_current');
} else if (index < moveToIndex) {
$column.css({left: '-100%'});
diff --git a/addons/web/static/src/scss/kanban_view_mobile.scss b/addons/web/static/src/scss/kanban_view_mobile.scss
index 1c5a9eab531..b74ae8aaea5 100644
--- a/addons/web/static/src/scss/kanban_view_mobile.scss
+++ b/addons/web/static/src/scss/kanban_view_mobile.scss
@@ -36,9 +36,6 @@
margin-left: 0; // override the margin-left: -1px of the desktop mode
border: none;
- &.o_current {
- position: initial;
- }
.o_kanban_header {
display: none;
}
diff --git a/addons/web/static/tests/views/kanban_mobile_tests.js b/addons/web/static/tests/views/kanban_mobile_tests.js
index a9eec223143..98e65d1ea9c 100644
--- a/addons/web/static/tests/views/kanban_mobile_tests.js
+++ b/addons/web/static/tests/views/kanban_mobile_tests.js
@@ -56,7 +56,7 @@ QUnit.module('Views', {
QUnit.module('KanbanView Mobile');
QUnit.test('mobile grouped rendering', function (assert) {
- assert.expect(11);
+ assert.expect(9);
var kanban = createView({
View: KanbanView,
@@ -75,8 +75,6 @@ QUnit.module('Views', {
assert.containsN(kanban, '.o_kanban_group', 2, "should have 2 columns" );
assert.hasClass(kanban.$('.o_kanban_mobile_tab:first'),'o_current',
"first tab is the active tab with class 'o_current'");
- assert.hasClass(kanban.$('.o_kanban_group:first'),'o_current',
- "first column is the active column with class 'o_current'");
assert.containsN(kanban, '.o_kanban_group:first > div.o_kanban_record', 2,
"there are 2 records in active tab");
assert.strictEqual(kanban.$('.o_kanban_group:nth(1) > div.o_kanban_record').length, 0,
@@ -91,8 +89,6 @@ QUnit.module('Views', {
kanban.$('.o_kanban_mobile_tab:nth(1)').trigger('click');
assert.hasClass(kanban.$('.o_kanban_mobile_tab:nth(1)'),'o_current',
"second tab is now active with class 'o_current'");
- assert.hasClass(kanban.$('.o_kanban_group:nth(1)'),'o_current',
- "second column is now active with class 'o_current'");
assert.strictEqual(kanban.$('.o_kanban_group:nth(1) > div.o_kanban_record').length, 2,
"the 2 records of the second group have now been loaded");