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

Refactor RM model so that rma:hold is used

Browse Source 
* rma:holdContainerChild removed
 * capabilities, forms and actions updated
 * UI tests updated
 * relates to RM-1203, RM-1205, RM-1209



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@64116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-03-13 10:19:45 +00:00
parent dfafd3507b
commit c8e1418e77
8 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
View File

@@ -36,7 +36,6 @@ public enum FilePlanComponentKind
TRANSFER,
HOLD,
HOLD_CONTAINER,
HOLD_CONTAINER_CHILD,
DISPOSITION_SCHEDULE,
UNFILED_RECORD_CONTAINER,
UNFILED_RECORD_CONTAINER_CHILD;

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
View File

@@ -218,10 +218,6 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
{
result = FilePlanComponentKind.HOLD_CONTAINER;
}
else if (instanceOf(nodeRef, TYPE_HOLD_CONTAINER_CHILD))
{
result = FilePlanComponentKind.HOLD_CONTAINER_CHILD;
}
else if (getFreezeService().isHold(nodeRef))
{
result = FilePlanComponentKind.HOLD;

5
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
View File

@@ -260,11 +260,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC
result = "hold-container";
break;
}
case HOLD_CONTAINER_CHILD:
{
result = "hold-container-child";
break;
}
case TRANSFER:
{
result = "transfer-container";

9
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
View File

@@ -65,8 +65,7 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
// Hold container
static final QName TYPE_HOLD_CONTAINER = QName.createQName(RM_URI, "holdContainer");
static final QName TYPE_HOLD_CONTAINER_CHILD = QName.createQName(RM_URI, "holdContainerChild");
// Transfer container
static final QName TYPE_TRANSFER_CONTAINER = QName.createQName(RM_URI, "transferContainer");
@@ -104,12 +103,6 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
static final QName ASPECT_RECORD = QName.createQName(RM_URI, "record");
static final QName PROP_DATE_FILED = QName.createQName(RM_URI, "dateFiled");
static final QName PROP_ORIGIONAL_NAME = QName.createQName(RM_URI, "origionalName");
//static final QName PROP_ORIGINATOR = QName.createQName(RM_URI, "originator");
//static final QName PROP_ORIGINATING_ORGANIZATION = QName.createQName(RM_URI, "originatingOrganization");
//static final QName PROP_PUBLICATION_DATE = QName.createQName(RM_URI, "publicationDate");
//static final QName PROP_MEDIA_TYPE = QName.createQName(RM_URI, "mediaType");
//static final QName PROP_FORMAT = QName.createQName(RM_URI, "format");
//static final QName PROP_DATE_RECEIVED = QName.createQName(RM_URI, "dateReceived");
// Common record details
static final QName PROP_LOCATION = QName.createQName(RM_URI, "location");