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

RM-6851 updates from review

Browse Source
This commit is contained in:
Sara Aspery
2019-05-23 15:17:04 +01:00
parent 16ef2130a8
commit dc2e6f9f57
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service.properties
View File

@@ -21,4 +21,5 @@ rm.service.final-version=Final
rm.service.final-version-description=The final archived record version rm.service.final-version-description=The final archived record version
rm.service.enable-autoversion-on-record-creation=Auto Version on Record Creation rm.service.enable-autoversion-on-record-creation=Auto Version on Record Creation
rm.service.add-children-to-closed-record-folder=You can't add new items to a closed record folder. rm.service.add-children-to-closed-record-folder=You can't add new items to a closed record folder.
rm.service.add-children-to-frozen-record-folder=You can't add new items to a frozen record folder.
rm.service.update-record-content=You can't update a record's content property. rm.service.update-record-content=You can't update a record's content property.

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -1068,7 +1068,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
if (freezeService.isFrozen(newRecordContainer)) if (freezeService.isFrozen(newRecordContainer))
{ {
throw new AccessDeniedException(I18NUtil.getMessage("permissions.err_access_denied")); throw new IntegrityException(I18NUtil.getMessage("rm.service.add-children-to-frozen-record-folder"),null);
} }
} }

3
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImplUnitTest.java
View File

@@ -50,6 +50,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel; import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest; import org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest;
import org.alfresco.repo.node.integrity.IntegrityException;
import org.alfresco.repo.policy.Behaviour; import org.alfresco.repo.policy.Behaviour;
import org.alfresco.repo.security.permissions.AccessDeniedException; import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -590,7 +591,7 @@ public class RecordServiceImplUnitTest extends BaseUnitTest
* When I create the record specifying a folder which is in a hold * When I create the record specifying a folder which is in a hold
* Then an exception is thrown * Then an exception is thrown
*/ */
@Test(expected=AccessDeniedException.class) @Test(expected= IntegrityException.class)
public void createRecordIntoRecordFolderInHold() public void createRecordIntoRecordFolderInHold()
{ {
mocksForRecordCreation(); mocksForRecordCreation();