Skip to content
Snippets Groups Projects
Commit 8ffd08d5 authored by Lotte Hofstede's avatar Lotte Hofstede
Browse files

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

parents 5f76bba0 befe08b5
Branches
Tags
No related merge requests found
......@@ -178,8 +178,9 @@ export class PaginationComponent implements OnDestroy, OnInit {
const fixedProperties = this.validateParams(queryParams);
if (isNotEmpty(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 fixedFields: any = {};
if (+params.page !== validPage) {
fixedFields.page = validPage;
fixedFields.page = validPage.toString();
}
if (+params.pageSize !== filteredSize) {
fixedFields.pageSize = filteredSize;
fixedFields.pageSize = filteredSize.toString();
}
return fixedFields;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment