Rename rma:unfiledRecordContinerChildt to rma:unfiledRecordFolder

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

View File

@@ -188,7 +188,7 @@
<property name="kinds">
<list>
<value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
</list>
</property>
<property name="conditions">

View File

@@ -161,7 +161,7 @@
<property name="kinds">
<list>
<value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
</list>
</property>
<property name="conditions">
@@ -179,7 +179,7 @@
<property name="kinds">
<list>
<value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
</list>
</property>
<property name="conditions">
@@ -197,7 +197,7 @@
<property name="kinds">
<list>
<value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
</list>
</property>
<property name="conditions">
@@ -218,7 +218,7 @@
<property name="kinds">
<list>
<value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
</list>
</property>
<property name="conditions">

View File

@@ -96,9 +96,8 @@
<parent>rma:recordsManagementContainer</parent>
</type>
<!-- TODO rename to unfiledRecordFolder -->
<type name="rma:unfiledRecordContainerChild">
<title>Unfiled Record Container Child</title>
<type name="rma:unfiledRecordFolder">
<title>Unfiled Record Folder</title>
<parent>rma:recordsManagementContainer</parent>
</type>

View File

@@ -217,7 +217,7 @@
<value>RECORD_CATEGORY</value>
<value>RECORD_FOLDER</value>
<value>RECORD</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
<value>HOLD</value>
</set>
</property>
@@ -263,7 +263,7 @@
<property name="kinds">
<set>
<value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
</set>
</property>
<property name="capability" value="CopyUnfiledRecordFolder"/>
@@ -319,7 +319,7 @@
<property name="kinds">
<set>
<value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
</set>
</property>
<property name="capability" value="MoveUnfiledRecordsContainerFolder"/>
@@ -379,7 +379,7 @@
<value>RECORD_CATEGORY</value>
<value>RECORD_FOLDER</value>
<value>RECORD</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
<value>HOLD</value>
</set>
</property>
@@ -395,7 +395,7 @@
<value>RECORD_CATEGORY</value>
<value>RECORD_FOLDER</value>
<value>UNFILED_RECORD_CONTAINER</value>
<value>UNFILED_RECORD_CONTAINER_CHILD</value>
<value>UNFILED_RECORD_FOLDER</value>
<value>HOLD_CONTAINER</value>
<value>HOLD</value>
</set>

View File

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

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;
}
}

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:

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");

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))
{