From fa1aafa97d0c085e097245ae721007ce0261bae7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 17 Oct 2012 13:58:45 +0200 Subject: [PATCH] [FIX] in-group pagination of list views bzr revid: xmo@openerp.com-20121017115845-9ch6icjjhrzycj84 --- addons/web/static/src/css/base.css | 4 +++- addons/web/static/src/css/base.sass | 2 ++ addons/web/static/src/js/view_list.js | 7 +++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8925c3a0964..e62a01b4870 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,7 +25,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -2592,6 +2591,9 @@ min-width: 0 !important; max-width: none !important; } +.openerp .oe_list_group_name { + white-space: nowrap; +} .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a1adfe67e75..2787535d3ab 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2049,6 +2049,8 @@ $sheet-max-width: 860px .oe_form_field_float,.oe_form_view_integer,&.oe_form_field_datetime,&.oe_form_field_date min-width: 0 !important max-width: none !important + .oe_list_group_name + white-space: nowrap // }}} // FormView.many2many {{{ .oe_form .oe_form_field_many2many > .oe_list diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index a6aa637f655..de7f157c96d 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -1230,6 +1230,7 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we .replaceWith(self.render()); }); this.$row.children().last() + .addClass('oe_list_group_pagination') .append($prev) .append('') .append($next); @@ -1414,10 +1415,12 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we })) .end() .find('button[data-pager-action=previous]') - .attr('disabled', page === 0) + .css('visibility', + page === 0 ? 'hidden' : '') .end() .find('button[data-pager-action=next]') - .attr('disabled', page === pages - 1); + .css('visibility', + page === pages - 1 ? 'hidden' : ''); } }