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

Merged BRANCHES/V2.3 to HEAD:

Browse Source 
96064: RM-1871 : Merged revision(s) 94472 from /DEV/BUGFIXING/HEAD-2014_12_09
   96119: RM-1551 (It is possible to delete Place Reader or Writer roles from Admin tools)
   96123: RM-1892 (The file report action is not working for transferred folders and files in French)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@96125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2015-02-04 18:12:40 +00:00
parent 2a9b16733f 82d87f99a1
commit 23bb42eb9e
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_fr.properties
View File

@@ -1,6 +1,6 @@
# File Report Template
file.report.acession.report=Rapport sur le versement \u00e0 un autre organisme
file.report.date.format=EEE MMM jj HH:mm:ss zzz yyyy
file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy
file.report.declared.by=d\u00e9clar\u00e9 par
file.report.declared.on=le
file.report.destroyed=D\u00e9truit

2
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties
View File

@@ -1,6 +1,6 @@
# File Report Template
file.report.acession.report=Overdrachtsrapport
file.report.date.format=EEE MMM dd UU:mm:ss zzz jjjj
file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy
file.report.declared.by=gedeclareerd door
file.report.declared.on=op
file.report.destroyed=Vernietigd

2
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/template_pt_BR.properties
View File

@@ -1,6 +1,6 @@
# File Report Template
file.report.acession.report=Relat\u00f3rio de ades\u00e3o
file.report.date.format=EEE MMM dd HH:mm:ss zzz aaaa
file.report.date.format=EEE MMM dd HH:mm:ss zzz yyyy
file.report.declared.by=declarado por
file.report.declared.on=em
file.report.destroyed=Destru\u00eddos

10
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java
View File

@@ -240,10 +240,16 @@ public class TransferServiceImpl extends ServiceBaseImpl
List<ChildAssociationRef> assocs = nodeService.getChildAssocs(nodeRef, ASSOC_TRANSFERRED, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef assoc : assocs)
{
if (freezeService.hasFrozenChildren(assoc.getChildRef()))
if(freezeService.isFrozen(assoc.getChildRef()))
{
throw new AlfrescoRuntimeException("Could not complete a transfer that contain frozen children.");
throw new AlfrescoRuntimeException("Could not complete a transfer that contains held folders");
}
if(freezeService.hasFrozenChildren(assoc.getChildRef()))
{
throw new AlfrescoRuntimeException("Cound not complete a transfer that contains folders with held children");
}
markComplete(assoc.getChildRef(), accessionIndicator, transferLocation);
}