From 1121127ed250e11d3f4d475f8ff6e5a031e25df4 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Wed, 15 Jul 2015 16:25:24 +0000 Subject: [PATCH] RM-2466 (Show the correct number of existing pages and make them available for navigation in the Security Clearance page) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@108366 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ...gResultsPostMethodInvocationProcessor.java | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/PagingResultsPostMethodInvocationProcessor.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/PagingResultsPostMethodInvocationProcessor.java index e6001ab5ed..0027a44c05 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/PagingResultsPostMethodInvocationProcessor.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/interceptor/processor/PagingResultsPostMethodInvocationProcessor.java @@ -18,6 +18,8 @@ */ package org.alfresco.module.org_alfresco_module_rm.classification.interceptor.processor; +import static org.apache.commons.collections.ListUtils.isEqualList; + import java.util.List; import org.alfresco.query.PagingResults; @@ -58,31 +60,34 @@ public class PagingResultsPostMethodInvocationProcessor extends BasePostMethodIn List page = pagingResults.getPage(); final List processedPage = getPostMethodInvocationProcessor().process(page); - result = (T) new PagingResults() + if (!isEqualList(page, processedPage)) { - @Override - public String getQueryExecutionId() + result = (T) new PagingResults() { - return pagingResults.getQueryExecutionId(); - } - @Override - public List getPage() - { - return processedPage; - } - @Override - public boolean hasMoreItems() - { - // hasMoreItems might not be correct. Cannot determine the correct value as request details are needed. - return pagingResults.hasMoreItems(); - } - @Override - public Pair getTotalResultCount() - { - int size = processedPage.size(); - return new Pair(size, size); - } - }; + @Override + public String getQueryExecutionId() + { + return pagingResults.getQueryExecutionId(); + } + @Override + public List getPage() + { + return processedPage; + } + @Override + public boolean hasMoreItems() + { + // hasMoreItems might not be correct. Cannot determine the correct value as request details are needed. + return pagingResults.hasMoreItems(); + } + @Override + public Pair getTotalResultCount() + { + int size = processedPage.size(); + return new Pair(size, size); + } + }; + } } return result;