odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] make paginator work correctly on groups 

bzr revid: xmo@openerp.com-20110624130713-65wt8r7cmzo4wdor
This commit is contained in:
Xavier Morel 2011-06-24 15:07:13 +02:00
parent d567ba23ad
commit b309810e14
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
addons/base/static/src/js/list.js
View File

@ -789,6 +789,8 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
this.$row = null; this.$row = null;
this.children = {}; this.children = {};
this.page = 0;
}, },
make_fragment: function () { make_fragment: function () {
return document.createDocumentFragment(); return document.createDocumentFragment();
@ -820,12 +822,32 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
} }
return red_letter_tboday; return red_letter_tboday;
}, },
make_paginator: function () {
var self = this;
var $prev = $('<button type="button" data-pager-action="previous">&lt;</button>')
.click(function (e) {
e.stopPropagation();
self.page -= 1;
self.$row.closest('tbody').next()
.replaceWith(self.render());
});
var $next = $('<button type="button" data-pager-action="next">&gt;</button>')
.click(function (e) {
e.stopPropagation();
self.page += 1;
self.$row.closest('tbody').next()
.replaceWith(self.render());
});
this.$row.children().last()
.append($prev)
.append('<span class="oe-pager-state"></span>')
.append($next);
},
open: function (point_insertion) { open: function (point_insertion) {
this.render().insertAfter(point_insertion); this.render().insertAfter(point_insertion);
this.$row.children().last() this.make_paginator();
.append('<button type="button" data-pager-action="previous">&lt;</button>')
.append('<span class="oe-pager-state"></span>')
.append('<button type="button" data-pager-action="next">&gt;</button>');
}, },
close: function () { close: function () {
this.$row.children().last().empty(); this.$row.children().last().empty();
@ -955,25 +977,26 @@ openerp.base.ListView.Groups = Class.extend( /** @lends openerp.base.ListView.Gr
var view = this.view, var view = this.view,
limit = view.limit(), limit = view.limit(),
d = new $.Deferred(); d = new $.Deferred(),
page = this.datagroup.openable ? this.page : view.page;
dataset.read_slice( dataset.read_slice(
_.filter(_.pluck(this.columns, 'name'), _.identity), _.filter(_.pluck(this.columns, 'name'), _.identity),
view.page * limit, limit, page * limit, limit,
function (records) { function (records) {
if (!self.datagroup.openable) { if (!self.datagroup.openable) {
view.configure_pager(dataset); view.configure_pager(dataset);
} else { } else {
var page = 1, var pages = Math.ceil(dataset.ids.length / limit);
pages = Math.ceil(dataset.ids.length / limit);
self.$row self.$row
.find('.oe-pager-state') .find('.oe-pager-state')
.text(_.sprintf('%d/%d', page, pages)) .text(_.sprintf('%d/%d', page + 1, pages))
.end() .end()
.find('button[data-pager-action=previous]') .find('button[data-pager-action=previous]')
.attr('disabled', page === 1) .attr('disabled', page === 0)
.end() .end()
.find('button[data-pager-action=next]') .find('button[data-pager-action=next]')
.attr('disabled', page === pages); .attr('disabled', page === pages - 1);
} }
var form_records = _(records).map( var form_records = _(records).map(