Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

76558: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      75813: Merged DEV V4.2-BUG-FIX to V4.2-BUG-FIX (4.2.3)
         65552: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
           - 'hasMoreItems' value calculation has been modified to take into account skipped elements
         67687: MNT-10977: Workflow process retrieval returns incorrect hasMoreItems value
           - 'org.alfresco.rest.workflow.api.impl.ProcessesImplTest' has been implemented to cover both test cases of the issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-22 15:26:48 +00:00
parent 60e59533eb
commit fe8594a249
3 changed files with 186 additions and 1 deletions

View File

@@ -495,7 +495,7 @@ public class ProcessesImpl extends WorkflowRestImpl implements Processes
page.add(processInfo);
}
return CollectionWithPagingInfo.asPaged(paging, page, page.size() != totalCount, totalCount);
return CollectionWithPagingInfo.asPaged(paging, page, (page.size() + paging.getSkipCount()) != totalCount, totalCount);
}
@Override