inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
131275 cturlica: REPO-1360: Filter sites by visibility - add automated tests
      - added new tests for filter by visibility
      - updated getSites by personId because the value of totalItems wasn't calculated, also updated existing tests that where using the incorrect expected value.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:33:06 +00:00
parent 80daf219db
commit 68fc7c7cc1
4 changed files with 394 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/rest/api/impl/SitesImpl.java
View File

@@ -562,8 +562,10 @@ public class SitesImpl implements Sites
List<FilterProp> filterProps = getFilterPropListOfSites(parameters);
int counter;
int totalItems = 0;
Iterator<SiteMembership> it = sortedSiteMembers.iterator();
for(int counter = 0; counter < pageDetails.getEnd() && it.hasNext();)
for(counter = 0; it.hasNext();)
{
SiteMembership siteMember = it.next();
@@ -574,22 +576,23 @@ public class SitesImpl implements Sites
if(counter < pageDetails.getSkipCount())
{
totalItems++;
counter++;
continue;
}
if(counter > pageDetails.getEnd() - 1)
if (counter <= pageDetails.getEnd() - 1)
{
break;
SiteInfo siteInfo = siteMember.getSiteInfo();
MemberOfSite memberOfSite = new MemberOfSite(siteInfo.getShortName(), siteInfo.getNodeRef(), siteMember.getRole());
ret.add(memberOfSite);
counter++;
}
SiteInfo siteInfo = siteMember.getSiteInfo();
MemberOfSite memberOfSite = new MemberOfSite(siteInfo.getShortName(), siteInfo.getNodeRef(), siteMember.getRole());
ret.add(memberOfSite);
counter++;
totalItems++;
}
return CollectionWithPagingInfo.asPaged(paging, ret, pageDetails.hasMoreItems(), null);
return CollectionWithPagingInfo.asPaged(paging, ret, counter < totalItems, totalItems);
}