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

126689 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      126661 jvonka: RA-1045: As requested for SFS, allow rendition details (available/created renditions only) for shared link to be listed via no auth.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:57:39 +00:00
parent 8aacfd1b1f
commit 742a76a7c7
7 changed files with 110 additions and 5 deletions

View File

@@ -144,6 +144,7 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
Class resAction = null;
String entityId = templateVars.get(ResourceLocator.ENTITY_ID);
String relationshipId = templateVars.get(ResourceLocator.RELATIONSHIP_ID);
switch (rwm.getMetaData().getType())
{
@@ -176,6 +177,22 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
}
}
break;
case RELATIONSHIP:
if (StringUtils.isNotBlank(relationshipId))
{
if (RelationshipResourceAction.ReadById.class.isAssignableFrom(rwm.getResource().getClass()))
{
resAction = RelationshipResourceAction.ReadById.class;
}
}
else
{
if (RelationshipResourceAction.Read.class.isAssignableFrom(rwm.getResource().getClass()))
{
resAction = RelationshipResourceAction.Read.class;
}
}
break;
default:
break;
}