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

RM-2567

Browse Source 
The trashcan should not display the deleted documents that have been destroyed by the Data Cleanser

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@111062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2015-08-28 00:26:12 +00:00
parent b60b158946
commit a2b1bb0577
2 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rm-server/config/alfresco/module/org_alfresco_module_rm/model/classifiedContentModel.xml
View File

@@ -47,6 +47,7 @@
<aspects> <aspects>
<!-- Classified aspect --> <!-- Classified aspect -->
<aspect name="clf:classified"> <aspect name="clf:classified">
<archive>false</archive>
<properties> <properties>
<property name="clf:initialClassification"> <property name="clf:initialClassification">
<title>Initial Classification</title> <title>Initial Classification</title>

34
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/destroy/DestroyContentTest.java
View File

@@ -40,6 +40,7 @@ import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.test.AlfrescoTest; import org.alfresco.test.AlfrescoTest;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
@@ -148,6 +149,10 @@ public class DestroyContentTest extends BaseRMTestCase
// content cleansing hasn't taken place // content cleansing hasn't taken place
assertFalse(contentCleanser.hasCleansed()); assertFalse(contentCleanser.hasCleansed());
// ensure the record isn't in the archive store
NodeRef archiveNodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, subRecord.getId());
assertFalse(nodeService.exists(archiveNodeRef));
} }
}); });
} }
@@ -211,6 +216,11 @@ public class DestroyContentTest extends BaseRMTestCase
// content cleansing hasn't taken place // content cleansing hasn't taken place
assertFalse(contentCleanser.hasCleansed()); assertFalse(contentCleanser.hasCleansed());
// ensure the record isn't in the archive store
NodeRef archiveNodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, destroyableRecord.getId());
assertFalse(nodeService.exists(archiveNodeRef));
} }
}); });
} }
@@ -277,6 +287,10 @@ public class DestroyContentTest extends BaseRMTestCase
// content cleansing has taken place // content cleansing has taken place
assertTrue(contentCleanser.hasCleansed()); assertTrue(contentCleanser.hasCleansed());
// ensure the record isn't in the archive store
NodeRef archiveNodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, destroyableRecord.getId());
assertFalse(nodeService.exists(archiveNodeRef));
} }
public void after() throws Exception public void after() throws Exception
@@ -332,6 +346,10 @@ public class DestroyContentTest extends BaseRMTestCase
// content cleansing hasn't taken place // content cleansing hasn't taken place
assertFalse(contentCleanser.hasCleansed()); assertFalse(contentCleanser.hasCleansed());
// ensure the record isn't in the archive store
NodeRef archiveNodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, deleteableRecord.getId());
assertFalse(nodeService.exists(archiveNodeRef));
} }
}); });
} }
@@ -384,6 +402,10 @@ public class DestroyContentTest extends BaseRMTestCase
// content cleansing has taken place // content cleansing has taken place
assertTrue(contentCleanser.hasCleansed()); assertTrue(contentCleanser.hasCleansed());
// ensure the record isn't in the archive store
NodeRef archiveNodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, deleteableRecord.getId());
assertFalse(nodeService.exists(archiveNodeRef));
} }
public void after() throws Exception public void after() throws Exception
@@ -449,6 +471,10 @@ public class DestroyContentTest extends BaseRMTestCase
// content cleansing hasn't taken place // content cleansing hasn't taken place
assertFalse(contentCleanser.hasCleansed()); assertFalse(contentCleanser.hasCleansed());
// ensure the record isn't in the archive store
NodeRef archiveNodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, deleteableContent.getId());
assertFalse(nodeService.exists(archiveNodeRef));
} }
}); });
} }
@@ -511,6 +537,10 @@ public class DestroyContentTest extends BaseRMTestCase
// content cleansing has taken place // content cleansing has taken place
assertTrue(contentCleanser.hasCleansed()); assertTrue(contentCleanser.hasCleansed());
// ensure the record isn't in the archive store
NodeRef archiveNodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, deleteableContent.getId());
assertFalse(nodeService.exists(archiveNodeRef));
} }
public void after() throws Exception public void after() throws Exception
@@ -568,6 +598,10 @@ public class DestroyContentTest extends BaseRMTestCase
// content cleansing hasn't taken place // content cleansing hasn't taken place
assertFalse(contentCleanser.hasCleansed()); assertFalse(contentCleanser.hasCleansed());
// ensure the content is in the archive store
NodeRef archiveNodeRef = new NodeRef(StoreRef.STORE_REF_ARCHIVE_SPACESSTORE, deleteableContent.getId());
assertTrue(nodeService.exists(archiveNodeRef));
} }
}); });
} }