fix(pagination): off-by-one error

chatcher · chatcher · commit 29fdb7cd4856 · 2016-09-21T08:56:51.000-07:00
page index and page number were confused.
diff --git a/src/features/pagination/js/pagination.js b/src/features/pagination/js/pagination.js
@@ -77,7 +77,7 @@
                       return index < grid.options.paginationCurrentPage - 1 ? result + size : result;
                     }, 0);
                   }
-                  return ((grid.options.paginationCurrentPage - 1) * grid.options.paginationPageSize) + 1;
+                  return ((grid.options.paginationCurrentPage - 1) * grid.options.paginationPageSize);
                 },
                 /**
                  * @ngdoc method
diff --git a/src/features/pagination/templates/pagination.html b/src/features/pagination/templates/pagination.html
@@ -106,7 +106,7 @@
           ui-grid-one-bind-title="paginationThrough">
           -
         </abbr>
-        {{ paginationApi.getLastRowIndex() }} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}
+        {{ 1 + paginationApi.getLastRowIndex() }} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}
       </span>
     </div>
   </div>

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`return index < grid.options.paginationCurrentPage - 1 ? result + size : result;`
`78`	`78`	`}, 0);`
`79`	`79`	`}`
`80`		`- return ((grid.options.paginationCurrentPage - 1) * grid.options.paginationPageSize) + 1;`
	`80`	`+ return ((grid.options.paginationCurrentPage - 1) * grid.options.paginationPageSize);`
`81`	`81`	`},`
`82`	`82`	`/**`
`83`	`83`	`* @ngdoc method`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@`
`106`	`106`	`ui-grid-one-bind-title="paginationThrough">`
`107`	`107`	`-`
`108`	`108`	`</abbr>`
`109`		`- {{ paginationApi.getLastRowIndex() }} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}`
	`109`	`+ {{ 1 + paginationApi.getLastRowIndex() }} {{paginationOf}} {{grid.options.totalItems}} {{totalItemsLabel}}`
`110`	`110`	`</span>`
`111`	`111`	`</div>`
`112`	`112`	`</div>`