mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Fix the path being set on the Reference objects as it wasn't a valid XPath. Added some unit tests to clear up AR-1186.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -128,7 +128,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces
|
||||
{
|
||||
// Create the acl
|
||||
ACL acl = new ACL();
|
||||
acl.setReference(Utils.convertToReference(this.nodeService, node));
|
||||
acl.setReference(Utils.convertToReference(this.nodeService, this.namespaceService, node));
|
||||
|
||||
// Set the inhertied value
|
||||
boolean inheritPermission = this.permissionService.getInheritParentPermissions(node);
|
||||
@@ -332,7 +332,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces
|
||||
|
||||
// Create the permissions result object
|
||||
GetPermissionsResult result = new GetPermissionsResult();
|
||||
result.setReference(Utils.convertToReference(this.nodeService, node));
|
||||
result.setReference(Utils.convertToReference(this.nodeService, this.namespaceService, node));
|
||||
result.setPermissions((String[])permissions.toArray(new String[permissions.size()]));
|
||||
|
||||
// Add result to array
|
||||
@@ -451,7 +451,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces
|
||||
}
|
||||
|
||||
// Add to the results list
|
||||
results.add(new HasPermissionsResult(Utils.convertToReference(this.nodeService, node), permission, accessState));
|
||||
results.add(new HasPermissionsResult(Utils.convertToReference(this.nodeService, this.namespaceService, node), permission, accessState));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -556,7 +556,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces
|
||||
String owner = this.ownableService.getOwner(node);
|
||||
|
||||
// Marshal into result
|
||||
result[count] = new OwnerResult(Utils.convertToReference(this.nodeService, node), owner);
|
||||
result[count] = new OwnerResult(Utils.convertToReference(this.nodeService, this.namespaceService, node), owner);
|
||||
count ++;
|
||||
}
|
||||
|
||||
@@ -609,7 +609,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces
|
||||
this.ownableService.setOwner(node, owner);
|
||||
|
||||
// Marshal into result
|
||||
result[count] = new OwnerResult(Utils.convertToReference(this.nodeService, node), owner);
|
||||
result[count] = new OwnerResult(Utils.convertToReference(this.nodeService, this.namespaceService, node), owner);
|
||||
count ++;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user