Merge pull request #6840 from opf/core/fix/29052/table-pagination-cache

[29052] Only take cached perPage if it is still valid [ci skip]
6 years ago · 083ff712eb
parent 095158d322 cdbfd14292
commit 083ff712eb
1 changed files with 1 additions and 1 deletions
--- a/frontend/src/app/components/table-pagination/pagination-service.ts
+++ b/frontend/src/app/components/table-pagination/pagination-service.ts
@ -71,7 +71,7 @@ export class PaginationService {
    if (value !== undefined) {
      const perPage = parseInt(value, 10);
-      if (perPage > 0) {
+      if (perPage > 0 && (initialPageOptions.length === 0 || initialPageOptions.indexOf(perPage) !== -1)) {
        return perPage;
      }
    }