Merge branch 'fix/REPO-2365-GET-/shared-links-returns-403' into 'develop'

REPO-2365 :

See merge request !19
This commit is contained in:
Alex Mukha
2017-08-23 12:27:15 +01:00
parent 00f9c3618b
commit af2e069b2e

View File

@@ -1009,17 +1009,24 @@ public class QuickShareServiceImpl implements QuickShareService,
private String getSiteName(NodeRef nodeRef) private String getSiteName(NodeRef nodeRef)
{ {
NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef(); NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef();
while (parent != null && !nodeService.getType(parent).equals(SiteModel.TYPE_SITE)) while (parent != null && !nodeService.getType(parent).equals(SiteModel.TYPE_SITE))
{ {
// check that we can read parent name // check that we can read parent name
if (permissionService.hasReadPermission(parent) == AccessStatus.ALLOWED)
{
String parentName = (String) nodeService.getProperty(parent,ContentModel.PROP_NAME); String parentName = (String) nodeService.getProperty(parent,ContentModel.PROP_NAME);
}
else
{
return null;
}
if (nodeService.getPrimaryParent(nodeRef) != null) if (nodeService.getPrimaryParent(nodeRef) != null)
{ {
parent = nodeService.getPrimaryParent(parent).getParentRef(); parent = nodeService.getPrimaryParent(parent).getParentRef();
} }
} }
if (parent == null) if (parent == null)
{ {
return null; return null;