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-1532, fixed submission date comparison for some dates on edit metadata of completed pictures

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@75196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Hibbins
2014-06-30 09:29:27 +00:00
parent 42b84fea9e
commit b4081cc013
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -562,8 +562,17 @@ public class RecordServiceImpl extends BaseBehaviourBean
boolean propertyUnchanged = false; boolean propertyUnchanged = false;
if (beforeValue instanceof Date && afterValue instanceof Date) if (beforeValue instanceof Date && afterValue instanceof Date)
{ {
// deal with date values // deal with date values, remove the seconds and milliseconds for the
propertyUnchanged = (((Date)beforeValue).compareTo((Date)afterValue) == 0); // comparison as they are removed from the submitted for data
Calendar beforeCal = Calendar.getInstance();
beforeCal.setTime((Date)beforeValue);
Calendar afterCal = Calendar.getInstance();
afterCal.setTime((Date)afterValue);
beforeCal.set(Calendar.SECOND, 0);
beforeCal.set(Calendar.MILLISECOND, 0);
afterCal.set(Calendar.SECOND, 0);
afterCal.set(Calendar.MILLISECOND, 0);
propertyUnchanged = (beforeCal.compareTo(afterCal) == 0);
} }
else if ((afterValue instanceof Boolean) && (beforeValue == null) && (afterValue == Boolean.FALSE)) else if ((afterValue instanceof Boolean) && (beforeValue == null) && (afterValue == Boolean.FALSE))
{ {
@@ -1087,7 +1096,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
break; break;
} }
} }
// remove all RM related aspects from the node // remove all RM related aspects from the node
Set<QName> aspects = nodeService.getAspects(nodeRef); Set<QName> aspects = nodeService.getAspects(nodeRef);
for (QName aspect : aspects) for (QName aspect : aspects)
@@ -1098,45 +1107,45 @@ public class RecordServiceImpl extends BaseBehaviourBean
nodeService.removeAspect(nodeRef, aspect); nodeService.removeAspect(nodeRef, aspect);
} }
} }
// get the records primary parent association // get the records primary parent association
ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(nodeRef); ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(nodeRef);
// move the record into the collaboration site // move the record into the collaboration site
nodeService.moveNode(nodeRef, originatingLocation, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName()); nodeService.moveNode(nodeRef, originatingLocation, ContentModel.ASSOC_CONTAINS, parentAssoc.getQName());
// rename to the origional name // rename to the origional name
if (origionalName != null) if (origionalName != null)
{ {
fileFolderService.rename(nodeRef, origionalName); fileFolderService.rename(nodeRef, origionalName);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME); String name = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
logger.debug("Rename " + name + " to " + origionalName); logger.debug("Rename " + name + " to " + origionalName);
} }
} }
// save the information about the rejection details // save the information about the rejection details
Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(3); Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>(3);
aspectProperties.put(PROP_RECORD_REJECTION_USER_ID, userId); aspectProperties.put(PROP_RECORD_REJECTION_USER_ID, userId);
aspectProperties.put(PROP_RECORD_REJECTION_DATE, new Date()); aspectProperties.put(PROP_RECORD_REJECTION_DATE, new Date());
aspectProperties.put(PROP_RECORD_REJECTION_REASON, reason); aspectProperties.put(PROP_RECORD_REJECTION_REASON, reason);
nodeService.addAspect(nodeRef, ASPECT_RECORD_REJECTION_DETAILS, aspectProperties); nodeService.addAspect(nodeRef, ASPECT_RECORD_REJECTION_DETAILS, aspectProperties);
// Restore the owner of the document // Restore the owner of the document
if (StringUtils.isBlank(documentOwner)) if (StringUtils.isBlank(documentOwner))
{ {
throw new AlfrescoRuntimeException("Unable to find the creator of document."); throw new AlfrescoRuntimeException("Unable to find the creator of document.");
} }
ownableService.setOwner(nodeRef, documentOwner); ownableService.setOwner(nodeRef, documentOwner);
// clear the existing permissions // clear the existing permissions
permissionService.clearPermission(nodeRef, null); permissionService.clearPermission(nodeRef, null);
// restore permission inheritance // restore permission inheritance
permissionService.setInheritParentPermissions(nodeRef, true); permissionService.setInheritParentPermissions(nodeRef, true);
// send an email to the record creator // send an email to the record creator
notificationHelper.recordRejectedEmailNotification(nodeRef, recordId, documentOwner); notificationHelper.recordRejectedEmailNotification(nodeRef, recordId, documentOwner);
} }
@@ -1319,7 +1328,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
private boolean isRecordMetadata(NodeRef filePlan, QName property) private boolean isRecordMetadata(NodeRef filePlan, QName property)
{ {
boolean result = false; boolean result = false;
// grab the information about the properties parent type // grab the information about the properties parent type
ClassDefinition parent = null; ClassDefinition parent = null;
PropertyDefinition def = dictionaryService.getProperty(property); PropertyDefinition def = dictionaryService.getProperty(property);
@@ -1327,7 +1336,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
{ {
parent = def.getContainerClass(); parent = def.getContainerClass();
} }
// non-electronic record is considered a special case // non-electronic record is considered a special case
// TODO move non-electronic record support to a separate model namespace // TODO move non-electronic record support to a separate model namespace
if (parent != null && TYPE_NON_ELECTRONIC_DOCUMENT.equals(parent.getName())) if (parent != null && TYPE_NON_ELECTRONIC_DOCUMENT.equals(parent.getName()))
@@ -1338,7 +1347,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
{ {
// check the URI's // check the URI's
result = ArrayUtils.contains(RECORD_MODEL_URIS, property.getNamespaceURI()); result = ArrayUtils.contains(RECORD_MODEL_URIS, property.getNamespaceURI());
// check the custom model // check the custom model
if (!result && !ArrayUtils.contains(NON_RECORD_MODEL_URIS, property.getNamespaceURI())) if (!result && !ArrayUtils.contains(NON_RECORD_MODEL_URIS, property.getNamespaceURI()))
{ {