diff options
| author | Géry Debongnie <ged@odoo.com> | 2014-09-04 13:45:52 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2014-10-21 09:33:49 +0200 |
| commit | 14d5860b35f493b3de5fa1f33b1dfaa26b4b1445 (patch) | |
| tree | 957bbe7b6f0a6379e8dbc05958bd2a2b39a75454 /addons/web/static/src/js | |
| parent | ffb8bf31af57cf845796acc90fa0f8b8b7d14de3 (diff) | |
[IMP] readd pager functionality to web client
The pager was removed in the refactoring of view manager. This commit
readd the pager, and improves its rendering to avoid flickering
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list.js | 10 | ||||
| -rw-r--r-- | addons/web/static/src/js/views.js | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 0dc0aedb737..50c75457a9a 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -425,7 +425,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM $el.removeAttr("disabled"); }); }); - this.do_update_pager(); }, do_update_pager: function(hide_index) { this.$pager.toggle(this.dataset.ids.length > 1); diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index d7e867ad665..74b3927992d 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -289,7 +289,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi // Pager if (!this.$pager) { - this.$pager = $(QWeb.render("ListView.pager", {'widget':self})); + this.$pager = $(QWeb.render("ListView.pager", {'widget':self})).hide(); if (this.options.$buttons) { this.$pager.appendTo(this.options.$pager); } else { @@ -408,7 +408,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi this.$pager.hide(); else this.$pager.css("display", ""); - this.$pager.toggleClass('oe_list_pager_single_page', (total <= limit)); + this.$pager.find('.oe-pager-button').toggleClass('disabled', total <= limit); var spager = '-'; if (total) { var range_start = this.page * limit + 1; @@ -1517,12 +1517,10 @@ instance.web.ListView.Groups = instance.web.Class.extend( /** @lends instance.we })) .end() .find('button[data-pager-action=previous]') - .css('visibility', - page === 0 ? 'hidden' : '') + .toggleClass('disabled', page === 0) .end() .find('button[data-pager-action=next]') - .css('visibility', - page === pages - 1 ? 'hidden' : ''); + .toggleClass('disabled', page === pages - 1); } } diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index ac8d146823b..88e62433adb 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -568,7 +568,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this._super(); var $sidebar = this.flags.sidebar ? this.$('.oe_view_manager_sidebar') : undefined, - $pager = this.$('.oe_view_manager_pager'); + $pager = this.$('.oe-view-manager-pager'); this.$breadcrumbs = this.$('.oe-view-title'); this.$switch_buttons = this.$('.oe-view-manager-switch a'); |