Merged HEAD (5.2) to 5.2.N (5.2.1)

126549 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      124197 jvonka: RA-896: Fix Nodes API when getting st:site (single or listing) to not show delete in allowableOperations & also return 403 (rather than 500) if trying to delete/move


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:07:17 +00:00
parent 478ed2baae
commit 7b4e9153d4
2 changed files with 39 additions and 7 deletions

View File

@@ -1501,7 +1501,7 @@ public class NodesImpl implements Nodes
{
return true;
}
else if (type.equals(SiteModel.TYPE_SITES))
else if (type.equals(SiteModel.TYPE_SITES) || type.equals(SiteModel.TYPE_SITE))
{
// note: alternatively, we could inject SiteServiceInternal and use getSitesRoot (or indirectly via node locator)
return true;