From 7aeaabaa8955ac3ff21e791be818c102aca41b8d Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 27 Nov 2012 09:39:35 +0100 Subject: [PATCH 1/4] [FIX] web kanban: Remember all Ids dataset. For bug : click on Show More...(At Bottom of Kanban view). After, when you click on a record, it give : could not find id#x error. bzr revid: chm@openerp.com-20121127083935-6tmbvee0ghuta00f --- addons/web_kanban/static/src/js/kanban.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 398d65d17ce..357fa049d5f 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -642,13 +642,12 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ }, do_show_more: function(evt) { var self = this; + var ids = self.view.dataset.ids.splice(0); return this.dataset.read_slice(this.view.fields_keys.concat(['__last_update']), { 'limit': self.view.limit, 'offset': self.dataset_offset += self.view.limit }).then(function(records) { - records.forEach(function(r) { - self.view.dataset.ids.push(r.id); - }); + self.view.dataset.ids = self.view.dataset.ids.concat(ids); self.do_add_records(records); return records; }); From fbb42640ead9eaa430b12c487cf2b9d03027e8cc Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 27 Nov 2012 09:49:17 +0100 Subject: [PATCH 2/4] [FIX] web kanban: vertical-align: top. For bug : Hole on the kanban view like projects because the images is in vertical-align: bottom; bzr revid: chm@openerp.com-20121127084917-npvir1lkgol5ysbk --- addons/web_kanban/static/src/css/kanban.css | 1 + addons/web_kanban/static/src/css/kanban.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 9b74462ee13..81d8b709c21 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -279,6 +279,7 @@ .openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record { display: inline-block; padding: 2px; + vertical-align: top; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index b993b648691..8ccc831ed2c 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -266,6 +266,7 @@ .oe_kanban_record display: inline-block padding: 2px + vertical-align: top box-sizing: border-box -moz-box-sizing: border-box -webkit-box-sizing: border-box From ac7695e1c9eaad3a6d37508f3ec6b83711efefe1 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 27 Nov 2012 10:00:15 +0100 Subject: [PATCH 3/4] [FIX] web kanban: reset size-box bzr revid: chm@openerp.com-20121127090015-anw60k3u4tc49x5s --- addons/web_kanban/static/src/js/kanban.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 357fa049d5f..89142aeccb2 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -649,6 +649,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ }).then(function(records) { self.view.dataset.ids = self.view.dataset.ids.concat(ids); self.do_add_records(records); + self.compute_cards_auto_height(); return records; }); }, From 3196dbd84be218141c5d45b429fed04ba2d98cb6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 28 Nov 2012 18:10:24 +0100 Subject: [PATCH 4/4] [IMP] Preserve dataset ids order bzr revid: fme@openerp.com-20121128171024-qpkn9oo48xa9n2j4 --- addons/web_kanban/static/src/js/kanban.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 89142aeccb2..26da5e7c7e2 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -647,7 +647,7 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({ 'limit': self.view.limit, 'offset': self.dataset_offset += self.view.limit }).then(function(records) { - self.view.dataset.ids = self.view.dataset.ids.concat(ids); + self.view.dataset.ids = ids.concat(self.view.dataset.ids); self.do_add_records(records); self.compute_cards_auto_height(); return records;