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

Merge release/V2.4 into master.

Browse Source
This commit is contained in:
Tom Page
2016-04-13 10:16:57 +01:00
parent 7336d9da4b 41cd9092bb
commit 747265e003
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
View File

@@ -236,14 +236,14 @@ public class FilePlanComponentAspect extends BaseBehaviourBean
// If the node has any renditions, they inherit the file plan from their source node.
List<ChildAssociationRef> renditions = renditionService.getRenditions(nodeRef);
NodeRef thumbnail;
NodeRef rendition;
for (ChildAssociationRef chAssRef : renditions)
{
thumbnail = chAssRef.getChildRef();
if (nodeService.exists(thumbnail))
rendition = chAssRef.getChildRef();
if (nodeService.exists(rendition))
{
// Apply file plan component aspect to thumbnail
nodeService.addAspect(thumbnail, ASPECT_FILE_PLAN_COMPONENT, null);
// Apply file plan component aspect to node's renditions
nodeService.addAspect(rendition, ASPECT_FILE_PLAN_COMPONENT, null);
}
}
}

7
rm-community/rm-community-repo/source/java/org/alfresco/repo/imap/ExtendedImapServiceImpl.java
View File

@@ -54,12 +54,19 @@ public class ExtendedImapServiceImpl extends ImapServiceImpl
this.dictionaryService = dictionaryService;
}
public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
{
this.authenticationUtil = authenticationUtil;
}
@Override
public void setPolicyFilter(BehaviourFilter policyBehaviourFilter)
{
this.policyBehaviourFilter = policyBehaviourFilter;
super.setPolicyFilter(policyBehaviourFilter);
}
@Override
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;