Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-mutex-view-switcher-mat into lp:openerp-web/7.0

  1. 7.0-mutex-view-switcher-mat
  2. Merge into 7.0
Proposed by Martin Trigaux (OpenERP)
Status: Merged
Merged at revision: 4159
Proposed branch: lp:~openerp-dev/openerp-web/7.0-mutex-view-switcher-mat
Merge into: lp:openerp-web/7.0
Diff against target: 19 lines (+1/-1)
1 file modified
addons/web/static/src/js/view_form.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-mutex-view-switcher-mat
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+210794@code.launchpad.net

Description of the change

avoid concurrency problems in pager loading
way to reproduce: go to list view, switch to form and quickly back to list, both pagers are displayed

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/view_form.js'
2--- addons/web/static/src/js/view_form.js 2014-03-11 09:15:22 +0000
3+++ addons/web/static/src/js/view_form.js 2014-03-13 13:46:46 +0000
4@@ -276,6 +276,7 @@
5 filter: 'alpha(opacity = 0)'
6 });
7 this.$el.add(this.$buttons).removeClass('oe_form_dirty');
8+ this.$pager.toggle(this.dataset.ids.length > 1);
9
10 var shown = this.has_been_loaded;
11 if (options.reload !== false) {
12@@ -420,7 +421,6 @@
13 this.do_update_pager();
14 },
15 do_update_pager: function(hide_index) {
16- this.$pager.toggle(this.dataset.ids.length > 1);
17 if (hide_index) {
18 $(".oe_form_pager_state", this.$pager).html("");
19 } else {