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

[REV] Revert pager. List view uses <start> - <end> of <total> 

bzr revid: fme@openerp.com-20120509142134-tyeyae56efgppc17
This commit is contained in:
Fabien Meghazi 2012-05-09 16:21:34 +02:00
parent 319eac265e
commit 73409a6048
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/static/src/js/view_form.js
View File

@ -217,6 +217,9 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
this.$buttons.show();
this.$buttons.find('.oe_form_button_save').removeClass('oe_form_button_save_dirty');
}
if (this.$pager) {
this.$pager.show();
}
this.$element.show().css('visibility', 'hidden');
this.$element.removeClass('oe_form_dirty');
return this.has_been_loaded.pipe(function() {
@ -326,7 +329,6 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
this.$pager.find('button').prop('disabled', this.dataset.ids.length < 2).end()
.find('span.oe_pager_index').html(index).end()
.find('span.oe_pager_count').html(this.dataset.ids.length);
this.$pager.toggle(this.dataset.ids.length > 1);
},
parse_on_change: function (on_change, widget) {
var self = this;

20
addons/web/static/src/js/view_list.js
View File

@ -355,13 +355,18 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
this.dataset._length = dataset._length;
}
var page = this.page + 1,
total = Math.floor(dataset.size() / this.limit()) + 1;
var total = dataset.size();
var spager = '-';
if (total) {
var range_start = this.page * this.limit() + 1;
var range_stop = range_start - 1 + this.limit();
if (range_stop > total) {
range_stop = total;
}
spager = _.str.sprintf('%d-%d of %d', range_start, range_stop, total);
}
this.$pager.find('.oe-pager-state').text(isNaN(total)
? '-' : _.str.sprintf('%d / %d', page, total));
this.$pager.toggle(total > 1);
this.$pager.find('.oe-pager-state').text(spager);
},
/**
* Sets up the listview's columns: merges view and fields data, move
@ -465,6 +470,9 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
if (this.$buttons) {
this.$buttons.show();
}
if (this.$pager) {
this.$pager.show();
}
},
do_hide: function () {
if (this.sidebar) {