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

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 5266bbe71e
commit 808c83f4a6
9 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
View File

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

8
rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
View File

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

5
rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
View File

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

10
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
View File

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

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, HOLD_CONTAINER,
DISPOSITION_SCHEDULE, DISPOSITION_SCHEDULE,
UNFILED_RECORD_CONTAINER, 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; 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"; result = "transfer-container";
break; break;
} }
case UNFILED_RECORD_CONTAINER_CHILD: case UNFILED_RECORD_FOLDER:
{ {
result = "unfiled-record-container-child"; result = "unfiled-record-folder";
break; break;
} }
default: 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 // Unfiled record container
static final QName TYPE_UNFILED_RECORD_CONTAINER = QName.createQName(RM_URI, "unfiledRecordContainer"); static final QName TYPE_UNFILED_RECORD_CONTAINER = QName.createQName(RM_URI, "unfiledRecordContainer");
// Unfiled record container child // Unfiled record folder
static final QName TYPE_UNFILED_RECORD_CONTAINER_CHILD = QName.createQName(RM_URI, "unfiledRecordContainerChild"); static final QName TYPE_UNFILED_RECORD_FOLDER = QName.createQName(RM_URI, "unfiledRecordFolder");
// Hold container // Hold container
static final QName TYPE_HOLD_CONTAINER = QName.createQName(RM_URI, "holdContainer"); 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); QName parentType = nodeService.getType(parentRef);
boolean isContentSubType = dictionaryService.isSubClass(childType, ContentModel.TYPE_CONTENT); boolean isContentSubType = dictionaryService.isSubClass(childType, ContentModel.TYPE_CONTENT);
boolean isUnfiledRecordContainer = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER); boolean isUnfiledRecordContainer = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER);
boolean isUnfiledRecordContainerChild = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER_CHILD); boolean isUnfiledRecordFolder = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER);
if (isContentSubType && (isUnfiledRecordContainer|| isUnfiledRecordContainerChild)) if (isContentSubType && (isUnfiledRecordContainer || isUnfiledRecordFolder))
{ {
if (!nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT)) if (!nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT))
{ {