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

Rename rma:unfiledRecordContinerChildt to rma:unfiledRecordFolder

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@64752 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-03-17 23:45:26 +00:00
parent 3b0ab46dfc
commit 8fd2d4ecdb
9 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,5 +38,5 @@ public enum FilePlanComponentKind
HOLD_CONTAINER,
DISPOSITION_SCHEDULE,
UNFILED_RECORD_CONTAINER,
UNFILED_RECORD_CONTAINER_CHILD;
UNFILED_RECORD_FOLDER;
}

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

@@ -234,9 +234,9 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
{
result = FilePlanComponentKind.UNFILED_RECORD_CONTAINER;
}
else if (instanceOf(nodeRef, TYPE_UNFILED_RECORD_CONTAINER_CHILD))
else if (instanceOf(nodeRef, TYPE_UNFILED_RECORD_FOLDER))
{
result = FilePlanComponentKind.UNFILED_RECORD_CONTAINER_CHILD;
result = FilePlanComponentKind.UNFILED_RECORD_FOLDER;
}
}

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

@@ -265,9 +265,9 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC
result = "transfer-container";
break;
}
case UNFILED_RECORD_CONTAINER_CHILD:
case UNFILED_RECORD_FOLDER:
{
result = "unfiled-record-container-child";
result = "unfiled-record-folder";
break;
}
default:

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

@@ -60,8 +60,8 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
// Unfiled record container
static final QName TYPE_UNFILED_RECORD_CONTAINER = QName.createQName(RM_URI, "unfiledRecordContainer");
// Unfiled record container child
static final QName TYPE_UNFILED_RECORD_CONTAINER_CHILD = QName.createQName(RM_URI, "unfiledRecordContainerChild");
// Unfiled record folder
static final QName TYPE_UNFILED_RECORD_FOLDER = QName.createQName(RM_URI, "unfiledRecordFolder");
// Hold container
static final QName TYPE_HOLD_CONTAINER = QName.createQName(RM_URI, "holdContainer");

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
View File

@@ -143,8 +143,8 @@ public class RecordsManagementContainerType extends BaseBehaviourBean
QName parentType = nodeService.getType(parentRef);
boolean isContentSubType = dictionaryService.isSubClass(childType, ContentModel.TYPE_CONTENT);
boolean isUnfiledRecordContainer = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER);
boolean isUnfiledRecordContainerChild = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER_CHILD);
if (isContentSubType && (isUnfiledRecordContainer|| isUnfiledRecordContainerChild))
boolean isUnfiledRecordFolder = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER);
if (isContentSubType && (isUnfiledRecordContainer || isUnfiledRecordFolder))
{
if (!nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT))
{