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: Fix build

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@58373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-11-28 09:49:16 +00:00
parent 776798d6af
commit cfa932d0a0
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java
View File

@@ -307,6 +307,7 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin
public Void doWork() throws Exception public Void doWork() throws Exception
{ {
if (nodeService.exists(nodeRef) == true && if (nodeService.exists(nodeRef) == true &&
dictionaryService.getAllModels().contains(RM_CUSTOM_MODEL) == true &&
isCustomisable(aspectTypeQName) == true) isCustomisable(aspectTypeQName) == true)
{ {
QName customPropertyAspect = getCustomAspect(aspectTypeQName); QName customPropertyAspect = getCustomAspect(aspectTypeQName);
@@ -366,24 +367,27 @@ public class RecordsManagementAdminServiceImpl implements RecordsManagementAdmin
@Override @Override
public Void doWork() throws Exception public Void doWork() throws Exception
{ {
NodeRef nodeRef = childAssocRef.getChildRef(); if (dictionaryService.getAllModels().contains(RecordsManagementCustomModel.RM_CUSTOM_MODEL) == true)
QName type = nodeService.getType(nodeRef); {
while (type != null && ContentModel.TYPE_CMOBJECT.equals(type) == false) NodeRef nodeRef = childAssocRef.getChildRef();
{ QName type = nodeService.getType(nodeRef);
if (isCustomisable(type) == true) while (type != null && ContentModel.TYPE_CMOBJECT.equals(type) == false)
{ {
QName customPropertyAspect = getCustomAspect(type); if (isCustomisable(type) == true)
nodeService.addAspect(nodeRef, customPropertyAspect, null); {
} QName customPropertyAspect = getCustomAspect(type);
nodeService.addAspect(nodeRef, customPropertyAspect, null);
TypeDefinition def = dictionaryService.getType(type); }
if (def != null)
{ TypeDefinition def = dictionaryService.getType(type);
type = def.getParentName(); if (def != null)
} {
else type = def.getParentName();
{ }
type = null; else
{
type = null;
}
} }
} }