mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-07 10:04:21 +00:00
DS-3489: Fix facet results pagination
This commit is contained in:
@@ -148,7 +148,7 @@ public class DiscoveryRestController implements InitializingBean {
|
|||||||
|
|
||||||
FacetResultsResource facetResultsResource = new FacetResultsResource(facetResultsRest);
|
FacetResultsResource facetResultsResource = new FacetResultsResource(facetResultsRest);
|
||||||
|
|
||||||
halLinkService.addLinks(facetResultsResource);
|
halLinkService.addLinks(facetResultsResource, page);
|
||||||
return facetResultsResource;
|
return facetResultsResource;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -21,8 +21,8 @@ public class FacetResultsHalLinkFactory extends DiscoveryRestHalLinkFactory<Face
|
|||||||
FacetResultsRest data = halResource.getContent();
|
FacetResultsRest data = halResource.getContent();
|
||||||
|
|
||||||
if(data != null && pageable != null){
|
if(data != null && pageable != null){
|
||||||
PageImpl page = new PageImpl<>(list, data.getPage(),
|
PageImpl page = new PageImpl<>(data.getFacetResultList(), data.getPage(),
|
||||||
list.size() + (data.isHasMore() ? 1 : 0));
|
data.getFacetResultList().size() + (data.isHasMore() ? 1 : 0));
|
||||||
|
|
||||||
halResource.setPageHeader(new EmbeddedPageHeader(buildFacetBaseLink(data), page, false));
|
halResource.setPageHeader(new EmbeddedPageHeader(buildFacetBaseLink(data), page, false));
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user