mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Fixed the completely broken code in memberships.get.js REST API and the equally challenged URL that's calling it in colleagues.get.js.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -4,63 +4,60 @@
|
||||
|
||||
function main()
|
||||
{
|
||||
// Get the site id
|
||||
var shortName = url.extension.split("/")[0];
|
||||
var site = siteService.getSite(shortName);
|
||||
|
||||
// get the filters
|
||||
var nameFilter = args["nf"];
|
||||
var roleFilter = args["rf"];
|
||||
var authorityType = args["authorityType"];
|
||||
var sizeString = args["size"];
|
||||
|
||||
if(authorityType != null )
|
||||
{
|
||||
authorityType.match("[USER|GROUP]" != null)
|
||||
{
|
||||
status.setCode(status.STATUS_BAD_REQUEST, "The authorityType must be either USER or GROUP.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Get the filtered memberships
|
||||
// Comes back as a Map<String, String> containing the full authority name
|
||||
// and role
|
||||
var memberships = site.listMembers(nameFilter, roleFilter, sizeString != null ? parseInt(sizeString) : 0);
|
||||
|
||||
// Get a list of all the users resolved to person nodes
|
||||
var authorities = Array(memberships.length);
|
||||
var roles = {};
|
||||
|
||||
for (userName in memberships)
|
||||
{
|
||||
var membershipRole = memberships[userName];
|
||||
if(userName.match("^GROUP_"))
|
||||
{
|
||||
if(authorityType == null || authorityType == "GROUP")
|
||||
{
|
||||
// make sure the keys are strings - as usernames may be all
|
||||
// numbers!
|
||||
authorities['_' + userName] = groups.getGroupForFullAuthorityName(userName);
|
||||
roles['_' + userName] = membershipRole;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(authorityType == null || authorityType == "USER")
|
||||
{
|
||||
// make sure the keys are strings - as usernames may be all
|
||||
// numbers!
|
||||
authorities['_' + userName] = people.getPerson(userName);
|
||||
roles['_' + userName] = membershipRole;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Pass the information to the template
|
||||
model.site = site;
|
||||
model.roles = roles;
|
||||
model.authorities = authorities;
|
||||
// Get the site id
|
||||
var shortName = url.extension.split("/")[0];
|
||||
var site = siteService.getSite(shortName);
|
||||
|
||||
// get the filters
|
||||
var nameFilter = args["nf"];
|
||||
var roleFilter = args["rf"];
|
||||
var authorityType = args["authorityType"];
|
||||
var sizeString = args["size"];
|
||||
|
||||
if (authorityType != null)
|
||||
{
|
||||
if (authorityType.match("USER|GROUP") == null)
|
||||
{
|
||||
status.setCode(status.STATUS_BAD_REQUEST, "The 'authorityType' argument must be either USER or GROUP.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Get the filtered memberships
|
||||
// Comes back as a Map<String, String> containing the full authority name and role
|
||||
var memberships = site.listMembers(nameFilter, roleFilter, sizeString != null ? parseInt(sizeString) : 0);
|
||||
|
||||
// Get a list of all the users resolved to person nodes
|
||||
var authorities = Array(memberships.length);
|
||||
var roles = {};
|
||||
|
||||
for (userName in memberships)
|
||||
{
|
||||
var membershipRole = memberships[userName];
|
||||
if (userName.match("^GROUP_"))
|
||||
{
|
||||
if (authorityType == null || authorityType == "GROUP")
|
||||
{
|
||||
// make sure the keys are strings - as usernames may be all numbers!
|
||||
authorities['_' + userName] = groups.getGroupForFullAuthorityName(userName);
|
||||
roles['_' + userName] = membershipRole;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (authorityType == null || authorityType == "USER")
|
||||
{
|
||||
// make sure the keys are strings - as usernames may be all numbers!
|
||||
authorities['_' + userName] = people.getPerson(userName);
|
||||
roles['_' + userName] = membershipRole;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Pass the information to the template
|
||||
model.site = site;
|
||||
model.roles = roles;
|
||||
model.authorities = authorities;
|
||||
}
|
||||
|
||||
main();
|
Reference in New Issue
Block a user