Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -272,6 +272,14 @@ public class SiteMembersCannedQuery extends AbstractCannedQuery<SiteMembership>
}
ret = siteRole * multiplier;
}
else if(name.equals(SiteService.SortFields.Username))
{
if(personId1 == null || personId2 == null)
{
continue;
}
ret = personId * multiplier;
}
if(ret != 0)
{