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

Fixed merge issue which prevented declaring a file as record.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@43948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2012-11-26 10:36:57 +00:00
parent c4fb7ac119
commit 0fabdd31ec
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
View File

@@ -78,7 +78,7 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
// remove all owner related rights
this.ownableService.setOwner(actionedUponNodeRef, OwnableService.NO_OWNER);
}
}
else
{
logger.debug(buildMissingPropertiesErrorString(missingProperties));
@@ -108,8 +108,8 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
/**
* Helper method to check whether all the mandatory properties of the node have been set
*
* @param nodeRef node reference
* @return boolean true if all mandatory properties are set, false otherwise
* @param nodeRef node reference
* @return boolean true if all mandatory properties are set, false otherwise
*/
private boolean mandatoryPropertiesSet(NodeRef nodeRef, List<String> missingProperties)
{
@@ -162,8 +162,8 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
/**
* Log information about missing properties.
*
* @param propDef property definition
* @param missingProperties missing properties
* @param propDef property definition
* @param missingProperties missing properties
*/
private void logMissingProperty(PropertyDefinition propDef, List<String> missingProperties)
{
@@ -203,22 +203,8 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
{
return true;
}
else
{
if (throwException)
{
throw new AlfrescoRuntimeException(buildMissingPropertiesErrorString(missingProperties));
}
else
{
return false;
}
}
}
else
{
return false;
}
return false;
}
else
{
@@ -232,4 +218,5 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
}
}
}
}