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

Merge branch 'master' into feature/RM-3284_UI_tests_are_failing

Browse Source
This commit is contained in:
Kristijan Conkas
2016-04-14 16:23:04 +01:00
parent d5fd40d046 1fa5d3a6cc
commit ab63e09d8b
5 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/config/alfresco/extension/subsystems/imap/default/default/rm-imap-server-context.xml
View File

@@ -6,7 +6,7 @@
<!-- Extend Imap Service --> <!-- Extend Imap Service -->
<bean id="rm.imapService" abstract="true" class="org.alfresco.repo.imap.ExtendedImapServiceImpl"> <bean id="rm.imapService" abstract="true" class="org.alfresco.repo.imap.ExtendedImapServiceImpl">
<property name="dictionaryService" ref="DictionaryService"/> <property name="dictionaryService" ref="DictionaryService"/>
<property name="authenticationUtil" ref="AuthenticationUtil"/> <property name="authenticationUtil" ref="rm.authenticationUtil"/>
</bean> </bean>
<bean class="org.alfresco.util.BeanExtender"> <bean class="org.alfresco.util.BeanExtender">
<property name="beanName" value="imapService" /> <property name="beanName" value="imapService" />

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties
View File

@@ -104,7 +104,7 @@ reject.description=Hiermee wordt een record afgewezen en wordt het document naar
reject.reason.display-label=Reden voor afwijzing reject.reason.display-label=Reden voor afwijzing
# Request Information # Request Information
requestInfo.title=Informatie aanvragen requestInfo.title=Informatie aanvragen
requestInfo.description=Hiermee wordt een werkstroom gestart voor het aanvragen van meer informatie over een record. requestInfo.description=Hiermee wordt een workflow gestart voor het aanvragen van meer informatie over een record.
# Execute script # Execute script
executeScript.title=Script uitvoeren executeScript.title=Script uitvoeren
executeScript.description=Hiermee wordt een script uitgevoerd. executeScript.description=Hiermee wordt een script uitgevoerd.

4
rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties
View File

@@ -4,8 +4,8 @@ activitiReviewPooled.workflow.email.subject=Informatie aangeleverd voor de recor
activitiReviewPooled.workflow.email.body1=De gebruiker activitiReviewPooled.workflow.email.body1=De gebruiker
activitiReviewPooled.workflow.email.body2=heeft de vereiste informatie voor de record aangeleverd. activitiReviewPooled.workflow.email.body2=heeft de vereiste informatie voor de record aangeleverd.
rmwf_workflowmodel.type.rmwf_workflowTask.title=Werkstroomtaak rmwf_workflowmodel.type.rmwf_workflowTask.title=Workflowtaak
rmwf_workflowmodel.type.rmwf_workflowTask.decription=Werkstroomtaak rmwf_workflowmodel.type.rmwf_workflowTask.decription=Workflowtaak
rmwf_workflowmodel.property.rmwf_requestedInformation.title=Aangevraagde informatie rmwf_workflowmodel.property.rmwf_requestedInformation.title=Aangevraagde informatie
rmwf_workflowmodel.property.rmwf_requestedInformation.decription=Aangevraagde informatie rmwf_workflowmodel.property.rmwf_requestedInformation.decription=Aangevraagde informatie
rmwf_workflowmodel.property.rmwf_message.title=Bericht rmwf_workflowmodel.property.rmwf_message.title=Bericht

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. // If the node has any renditions, they inherit the file plan from their source node.
List<ChildAssociationRef> renditions = renditionService.getRenditions(nodeRef); List<ChildAssociationRef> renditions = renditionService.getRenditions(nodeRef);
NodeRef thumbnail; NodeRef rendition;
for (ChildAssociationRef chAssRef : renditions) for (ChildAssociationRef chAssRef : renditions)
{ {
thumbnail = chAssRef.getChildRef(); rendition = chAssRef.getChildRef();
if (nodeService.exists(thumbnail)) if (nodeService.exists(rendition))
{ {
// Apply file plan component aspect to thumbnail // Apply file plan component aspect to node's renditions
nodeService.addAspect(thumbnail, ASPECT_FILE_PLAN_COMPONENT, null); 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; this.dictionaryService = dictionaryService;
} }
public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
{
this.authenticationUtil = authenticationUtil;
}
@Override
public void setPolicyFilter(BehaviourFilter policyBehaviourFilter) public void setPolicyFilter(BehaviourFilter policyBehaviourFilter)
{ {
this.policyBehaviourFilter = policyBehaviourFilter; this.policyBehaviourFilter = policyBehaviourFilter;
super.setPolicyFilter(policyBehaviourFilter); super.setPolicyFilter(policyBehaviourFilter);
} }
@Override
public void setNodeService(NodeService nodeService) public void setNodeService(NodeService nodeService)
{ {
this.nodeService = nodeService; this.nodeService = nodeService;