inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for pagesize on site collections for preview

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2008-07-25 15:14:53 +00:00
parent f123bca2f3
commit abc95e42d1
4 changed files with 86 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.desc.xml
View File

@@ -1,7 +1,7 @@
<webscript> <webscript>
<shortname>Sites</shortname> <shortname>Sites</shortname>
<description>Get a colleciton of the sites a person has an explicit member to.</description> <description>Get a colleciton of the sites a person has an explicit member to.</description>
<url>/api/people/{userid}/sites</url> <url>/api/people/{userid}/sites?size={pagesize?}&amp;pos={position?}</url>
<format default="json"/> <format default="json"/>
<authentication>user</authentication> <authentication>user</authentication>
<transaction>required</transaction> <transaction>required</transaction>

19
config/alfresco/templates/webscripts/org/alfresco/repository/person/person.sites.get.js
View File

@@ -16,6 +16,25 @@ function main()
// Get the list of sites // Get the list of sites
var sites = siteService.listUserSites(userName); var sites = siteService.listUserSites(userName);
var sizeString = args["size"];
if (sizeString != null)
{
var size = parseInt(sizeString);
if (size != NaN && size < sites.length)
{
// TODO this is a tempory implementaion to support preview client
// Only return the first n sites based on the passed page size
var pagedSites = Array();
for (var index = 0; index < size; index++)
{
pagedSites[index] = sites[index];
}
sites = pagedSites;
}
}
// Pass the queried sites to the template // Pass the queried sites to the template
model.sites = sites; model.sites = sites;
} }

38
config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.js
View File

@@ -1,9 +1,33 @@
// Get the filter parameters function main()
var nameFilter = args["namefilter"]; {
var sitePreset = args["sitepresetfilter"]; // Get the filter parameters
var nameFilter = args["nf"];
var sitePreset = args["spf"];
var sizeString = args["size"];
// Get the list of sites // Get the list of sites
var sites = siteService.listSites(nameFilter, sitePreset); var sites = siteService.listSites(nameFilter, sitePreset);
// Pass the queried sites to the template if (sizeString != null)
model.sites = sites; {
var size = parseInt(sizeString);
if (size != NaN && size < sites.length)
{
// TODO this is a tempory implementaion to support preview client
// Only return the first n sites based on the passed page size
var pagedSites = Array();
for (var index = 0; index < size; index++)
{
pagedSites[index] = sites[index];
}
sites = pagedSites;
}
}
// Add the sites to the model
model.sites = sites;
}
main();

38
source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
View File

@@ -144,15 +144,31 @@ public class SiteServiceTest extends BaseWebScriptTest
public void testGetSites() throws Exception public void testGetSites() throws Exception
{ {
// == Test basic GET with no filters ==
MockHttpServletResponse response = getRequest(URL_SITES, 200); MockHttpServletResponse response = getRequest(URL_SITES, 200);
JSONArray result = new JSONArray(response.getContentAsString()); JSONArray result = new JSONArray(response.getContentAsString());
assertNotNull(result);
assertEquals(0, result.length());
// TODO formalise this test once i can be sure that i know what's already in the site store createSite("myPreset", GUID.generate(), "myTitle", "myDescription", true, 200);
// ie: .. i need to clean up after myself in this test createSite("myPreset", GUID.generate(), "myTitle", "myDescription", true, 200);
createSite("myPreset", GUID.generate(), "myTitle", "myDescription", true, 200);
createSite("myPreset", GUID.generate(), "myTitle", "myDescription", true, 200);
createSite("myPreset", GUID.generate(), "myTitle", "myDescription", true, 200);
System.out.println(response.getContentAsString()); response = getRequest(URL_SITES, 200);
result = new JSONArray(response.getContentAsString());
assertNotNull(result);
assertEquals(5, result.length());
response = getRequest(URL_SITES + "?size=3", 200);
result = new JSONArray(response.getContentAsString());
assertNotNull(result);
assertEquals(3, result.length());
response = getRequest(URL_SITES + "?size=13", 200);
result = new JSONArray(response.getContentAsString());
assertNotNull(result);
assertEquals(5, result.length());
} }
public void testGetSite() throws Exception public void testGetSite() throws Exception
@@ -378,5 +394,17 @@ public class SiteServiceTest extends BaseWebScriptTest
assertNotNull(result); assertNotNull(result);
assertEquals(0, result.length()); assertEquals(0, result.length());
response = getRequest("/api/people/" + USER_ONE + "/sites?size=1", 200);
result = new JSONArray(response.getContentAsString());
assertNotNull(result);
assertEquals(1, result.length());
response = getRequest("/api/people/" + USER_ONE + "/sites?size=5", 200);
result = new JSONArray(response.getContentAsString());
assertNotNull(result);
assertEquals(2, result.length());
} }
} }