Merge lp:~openerp-dev/openerp-web/7.0-opw-599269-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of pager, there is inconsistency with pager, display of next page is impossible if records are deleted such that dataset size becomes less than or equals to limit, also if all records of current page is deleted then it does not navigate to previous page.

Demo:- To reproduce this issue go through following bug report description.

https://bugs.launchpad.net/openerp-web/+bug/1239851

There are many scenarios related to pager which shows issue with current pager.

Thanks.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, test)

[Martin Trigaux (OpenERP) (mat-openerp)]

Hello,

Thanks Mohammed for the fix and thanks Alexandre for the review. That looks good to me too. Merged in 7.0

revno: 4150 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2013-10-28 14:16:47 +0000
+++ addons/web/static/src/js/view_list.js	2013-10-29 09:44:50 +0000
@@ -403,6 +403,9 @@
         if (total) {
             var range_start = this.page * limit + 1;
             var range_stop = range_start - 1 + limit;
+            if (this.records.length) {
+                range_stop = range_start - 1 + this.records.length;
+            }
             if (range_stop > total) {
                 range_stop = total;
             }
@@ -597,7 +600,17 @@
             _(ids).each(function (id) {
                 self.records.remove(self.records.get(id));
             });
-            self.configure_pager(self.dataset);
+            if (self.records.length == 0 && self.dataset.size() > 0) {
+                //Trigger previous manually to navigate to previous page, 
+                //If all records are deleted on current page.
+                self.$pager.find('ul li:first a').trigger('click');
+            } else if (self.dataset.size() == self.limit()) {
+                //Reload listview to update current page with next page records 
+                //because pager going to be hide if dataset.size == limit
+                self.reload();
+            } else {
+                self.configure_pager(self.dataset);
+            }
             self.compute_aggregates();
         });
     },