diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldContainerType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldContainerType.java
index 49c5931e54..c01f544991 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldContainerType.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/HoldContainerType.java
@@ -37,18 +37,13 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.springframework.extensions.surf.util.I18NUtil;
-
-
/**
* rma:holdContainer behaviour bean
*
* @author Mihai Cozma
* @since 2.4
*/
-@BehaviourBean
-(
- defaultType = "rma:holdContainer"
-)
+@BehaviourBean(defaultType = "rma:holdContainer")
public class HoldContainerType extends BaseBehaviourBean
implements NodeServicePolicies.OnCreateChildAssociationPolicy, NodeServicePolicies.OnCreateNodePolicy
{
@@ -66,10 +61,8 @@ public class HoldContainerType extends BaseBehaviourBean
{
NodeRef nodeRef = childAssocRef.getChildRef();
- if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT) == true)
- {
- throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_ERROR_ADD_CONTENT_CONTAINER));
- }
+ if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT) == true) { throw new AlfrescoRuntimeException(
+ I18NUtil.getMessage(MSG_ERROR_ADD_CONTENT_CONTAINER)); }
}
@@ -77,8 +70,8 @@ public class HoldContainerType extends BaseBehaviourBean
public void onCreateNode(ChildAssociationRef childAssocRef)
{
NodeRef nodeRef = childAssocRef.getChildRef();
- if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT)) { throw new AlfrescoRuntimeException(
- "Operation failed, because you can't place content directly in hold container."); }
+ if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT) == true) { throw new AlfrescoRuntimeException(
+ I18NUtil.getMessage(MSG_ERROR_ADD_CONTENT_CONTAINER)); }
}
}
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerType.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerType.java
index a949622486..a557cf2efe 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerType.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/TransferContainerType.java
@@ -35,8 +35,7 @@ import org.alfresco.repo.policy.annotation.BehaviourBean;
import org.alfresco.repo.policy.annotation.BehaviourKind;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
-
-
+import org.springframework.extensions.surf.util.I18NUtil;
/**
* rma:transferContainer behaviour bean
@@ -44,13 +43,11 @@ import org.alfresco.service.cmr.repository.NodeRef;
* @author Mihai Cozma
* @since 2.4
*/
-@BehaviourBean
-(
- defaultType = "rma:transferContainer"
-)
+@BehaviourBean(defaultType = "rma:transferContainer")
public class TransferContainerType extends BaseBehaviourBean
implements NodeServicePolicies.OnCreateChildAssociationPolicy, NodeServicePolicies.OnCreateNodePolicy
{
+ private final static String MSG_ERROR_ADD_CONTENT_CONTAINER = "rm.service.error-add-content-container";
/**
* On every event
@@ -64,17 +61,15 @@ public class TransferContainerType extends BaseBehaviourBean
{
// ensure not content to be added in Holdsfolder
NodeRef nodeRef = childAssocRef.getChildRef();
- if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT)) { throw new AlfrescoRuntimeException(
- "Operation failed, because you can't place content directly into a record category."); }
-
+ if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT) == true) { throw new AlfrescoRuntimeException(
+ I18NUtil.getMessage(MSG_ERROR_ADD_CONTENT_CONTAINER)); }
}
@Override
public void onCreateNode(ChildAssociationRef childAssocRef)
{
NodeRef nodeRef = childAssocRef.getChildRef();
- if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT)) { throw new AlfrescoRuntimeException(
- "Operation failed, because you can't place content directly into a record category."); }
-
+ if (instanceOf(nodeRef, ContentModel.TYPE_CONTENT) == true) { throw new AlfrescoRuntimeException(
+ I18NUtil.getMessage(MSG_ERROR_ADD_CONTENT_CONTAINER)); }
}
}
diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3341Test.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3341Test.java
new file mode 100644
index 0000000000..fdf38a09f2
--- /dev/null
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM3341Test.java
@@ -0,0 +1,122 @@
+/*
+ * #%L
+ * Alfresco Records Management Module
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * -
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ * -
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * -
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ * -
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ *
+ */
+package org.alfresco.module.org_alfresco_module_rm.test.integration.issue;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
+import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Unit test for RM-3341 .. can copy to hold and transfer folder
+ *
+ * @since 2.4
+ */
+public class RM3341Test extends BaseRMTestCase
+{
+
+ private final static String MSG_ERROR_ADD_CONTENT_CONTAINER = "rm.service.error-add-content-container";
+
+ public void testCopyingContentsInHoldandTransfer() throws Exception
+ {
+ doTestInTransaction(new Test()
+ {
+ @Override
+ public Void run()
+ {
+ NodeRef holdContainer = filePlanService.getHoldContainer(filePlan);
+ assertNotNull(holdContainer);
+ NodeRef transferContainer = filePlanService.getTransferContainer(filePlan);
+ assertNotNull(transferContainer);
+
+ assertEquals(AccessStatus.ALLOWED,
+ permissionService.hasPermission(holdContainer, RMPermissionModel.FILING));
+ assertEquals(AccessStatus.ALLOWED,
+ permissionService.hasPermission(transferContainer, RMPermissionModel.FILING));
+
+ return null;
+ }
+ }, ADMIN_USER);
+
+ doTestInTransaction(new Test()
+ {
+ @Override
+
+ public Void run()
+ {
+
+ NodeRef holdContainer = filePlanService.getHoldContainer(filePlan);
+ assertNotNull(holdContainer);
+
+ try
+ {
+ FileInfo copyInfo = fileFolderService.create(holdContainer, "test file", ContentModel.TYPE_CONTENT);
+ fail("This should have thrown an exception");
+ }
+ catch (AlfrescoRuntimeException e)
+ {
+ // ("Content can't be added to a record container. Use record folders to file content.")
+ assertEquals(I18NUtil.getMessage(MSG_ERROR_ADD_CONTENT_CONTAINER), e.getMsgId());
+ }
+ return null;
+ }
+
+ });
+ doTestInTransaction(new Test()
+ {
+ @Override
+
+ public Void run()
+ {
+
+ NodeRef transferContainer = filePlanService.getTransferContainer(filePlan);
+ assertNotNull(transferContainer);
+
+ try
+ {
+
+ fileFolderService.create(transferContainer, "test content", ContentModel.TYPE_CONTENT);
+
+ fail("This should have thrown an exception");
+
+ }
+ catch (AlfrescoRuntimeException e)
+ {
+ // ("Content can't be added to a record container. Use record folders to file content.")
+ assertEquals(I18NUtil.getMessage(MSG_ERROR_ADD_CONTENT_CONTAINER), e.getMsgId());
+ }
+ return null;
+ }
+
+ });
+ }
+}