Merge branch 'master' into w2p-46063_truncation-implementation

This commit is contained in:
Lotte Hofstede
2018-02-05 11:32:33 +01:00

View File

@@ -178,9 +178,10 @@ export class PaginationComponent implements OnDestroy, OnInit {
const fixedProperties = this.validateParams(queryParams); const fixedProperties = this.validateParams(queryParams);
if (isNotEmpty(fixedProperties)) { if (isNotEmpty(fixedProperties)) {
this.fixRoute(fixedProperties); this.fixRoute(fixedProperties);
} } else {
this.setFields(); this.setFields();
} }
}
})); }));
} }
@@ -374,10 +375,10 @@ export class PaginationComponent implements OnDestroy, OnInit {
const filteredSize = this.validatePageSize(params.pageSize); const filteredSize = this.validatePageSize(params.pageSize);
const fixedFields: any = {}; const fixedFields: any = {};
if (+params.page !== validPage) { if (+params.page !== validPage) {
fixedFields.page = validPage; fixedFields.page = validPage.toString();
} }
if (+params.pageSize !== filteredSize) { if (+params.pageSize !== filteredSize) {
fixedFields.pageSize = filteredSize; fixedFields.pageSize = filteredSize.toString();
} }
return fixedFields; return fixedFields;
} }