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

Missed changes during resolving conflicts.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-06-02 22:58:00 +00:00
parent f660ff4c3f
commit 7d7f7edae9
6 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/rest/api/Nodes.java
View File

@@ -282,3 +282,4 @@ public interface Nodes
String PARAM_ISPRIMARY = "isPrimary";
String PARAM_ASSOC_TYPE = "assocType";
}

19
source/java/org/alfresco/rest/api/PublicApiDeclarativeRegistry.java
View File

@@ -117,6 +117,8 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
Class<? extends ResourceAction> resAction = null;
String entityId = templateVars.get(ResourceLocator.ENTITY_ID);
String relationshipId = templateVars.get(ResourceLocator.RELATIONSHIP_ID);
switch (rwm.getMetaData().getType())
{
case ENTITY:
@@ -148,6 +150,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;
}
@@ -433,3 +451,4 @@ public class PublicApiDeclarativeRegistry extends DeclarativeRegistry
initWebScript(getNetworkWebScript, "network");
}
}

1
source/java/org/alfresco/rest/api/Renditions.java
View File

@@ -83,3 +83,4 @@ public interface Renditions
*/
BinaryResource getContent(NodeRef sourceNodeRef, String renditionId, Parameters parameters);
}

3
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -2478,7 +2478,7 @@ public class NodesImpl implements Nodes
}
// Create a new file.
Node fileNode = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters);
final Node fileNode = createNewFile(parentNodeRef, fileName, nodeTypeQName, content, properties, assocTypeQName, parameters);
// RA-1052
try
@@ -2845,3 +2845,4 @@ public class NodesImpl implements Nodes
}
}
}

1
source/java/org/alfresco/rest/api/impl/RenditionsImpl.java
View File

@@ -465,3 +465,4 @@ public class RenditionsImpl implements Renditions, ResourceLoaderAware
return contentData.getMimetype();
}
}

1
source/java/org/alfresco/rest/api/quicksharelinks/QuickShareLinkRenditionsRelation.java
View File

@@ -73,3 +73,4 @@ public class QuickShareLinkRenditionsRelation implements
return quickShareLinks.getRenditions(sharedId);
}
}