[MERGE] Fix kanban dataset.ids missing when using 'Show more' button
bzr revid: fme@openerp.com-20121128171325-3euuu394e7ybpjzu
This commit is contained in:
commit
93091dad79
|
@ -279,6 +279,7 @@
|
||||||
.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record {
|
.openerp .oe_kanban_view.oe_kanban_ungrouped .oe_kanban_column .oe_kanban_record {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
|
vertical-align: top;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
-moz-box-sizing: border-box;
|
-moz-box-sizing: border-box;
|
||||||
-webkit-box-sizing: border-box;
|
-webkit-box-sizing: border-box;
|
||||||
|
|
|
@ -266,6 +266,7 @@
|
||||||
.oe_kanban_record
|
.oe_kanban_record
|
||||||
display: inline-block
|
display: inline-block
|
||||||
padding: 2px
|
padding: 2px
|
||||||
|
vertical-align: top
|
||||||
box-sizing: border-box
|
box-sizing: border-box
|
||||||
-moz-box-sizing: border-box
|
-moz-box-sizing: border-box
|
||||||
-webkit-box-sizing: border-box
|
-webkit-box-sizing: border-box
|
||||||
|
|
|
@ -642,14 +642,14 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
|
||||||
},
|
},
|
||||||
do_show_more: function(evt) {
|
do_show_more: function(evt) {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
var ids = self.view.dataset.ids.splice(0);
|
||||||
return this.dataset.read_slice(this.view.fields_keys.concat(['__last_update']), {
|
return this.dataset.read_slice(this.view.fields_keys.concat(['__last_update']), {
|
||||||
'limit': self.view.limit,
|
'limit': self.view.limit,
|
||||||
'offset': self.dataset_offset += self.view.limit
|
'offset': self.dataset_offset += self.view.limit
|
||||||
}).then(function(records) {
|
}).then(function(records) {
|
||||||
records.forEach(function(r) {
|
self.view.dataset.ids = ids.concat(self.view.dataset.ids);
|
||||||
self.view.dataset.ids.push(r.id);
|
|
||||||
});
|
|
||||||
self.do_add_records(records);
|
self.do_add_records(records);
|
||||||
|
self.compute_cards_auto_height();
|
||||||
return records;
|
return records;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue