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

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

Browse Source 
77129: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73474: ACE-1685: aclsReaders.post WebScript now includes denied authorities in results


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 15:41:36 +00:00
parent 390b32493c
commit 2ff1272a28
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/solr/AclReaders.java
View File

@@ -32,13 +32,14 @@ public class AclReaders
{ {
private Long aclId; private Long aclId;
private Set<String> readers; private Set<String> readers;
private Set<String> denied;
private long aclChangeSetId; private long aclChangeSetId;
private String tenantDomain = TenantService.DEFAULT_DOMAIN; private String tenantDomain = TenantService.DEFAULT_DOMAIN;
@Override @Override
public String toString() public String toString()
{ {
return "AclReaders [aclId=" + aclId + ", readers=" + readers + ", aclChangeSetId=" + aclChangeSetId + ", tenantDomain=" + tenantDomain + "]"; return "AclReaders [aclId=" + aclId + ", readers=" + readers + ", denied=" + denied + ", aclChangeSetId=" + aclChangeSetId + ", tenantDomain=" + tenantDomain + "]";
} }
public Long getAclId() public Long getAclId()
{ {
@@ -56,6 +57,14 @@ public class AclReaders
{ {
this.readers = aclReaders; this.readers = aclReaders;
} }
public Set<String> getDenied()
{
return denied;
}
public void setDenied(Set<String> denied)
{
this.denied = denied;
}
public long getAclChangeSetId() public long getAclChangeSetId()
{ {
return aclChangeSetId; return aclChangeSetId;

4
source/java/org/alfresco/repo/solr/SOLRTrackingComponentImpl.java
View File

@@ -257,10 +257,12 @@ public class SOLRTrackingComponentImpl implements SOLRTrackingComponent
List<AclReaders> aclsReaders = new ArrayList<AclReaders>(aclIds.size() * 10); List<AclReaders> aclsReaders = new ArrayList<AclReaders>(aclIds.size() * 10);
for (Long aclId : aclIds) for (Long aclId : aclIds)
{ {
Set<String> readersSet = permissionService.getReaders(aclId);
AclReaders readers = new AclReaders(); AclReaders readers = new AclReaders();
readers.setAclId(aclId); readers.setAclId(aclId);
Set<String> readersSet = permissionService.getReaders(aclId);
readers.setReaders(readersSet); readers.setReaders(readersSet);
Set<String> deniedSet = permissionService.getReadersDenied(aclId);
readers.setDenied(deniedSet);
Long aclChangeSetId = aclDAO.getAccessControlList(aclId).getProperties().getAclChangeSetId(); Long aclChangeSetId = aclDAO.getAccessControlList(aclId).getProperties().getAclChangeSetId();
readers.setAclChangeSetId(aclChangeSetId); readers.setAclChangeSetId(aclChangeSetId);