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

RM Bugs:

Browse Source 
- Images not showing in search results
  - Undeclared saved search showing record folders 
  - Records eligable for destruction saved search is showing already ghosted records
  - rma:transferring aspect added to objects being transferred
  - Records eligable for transfer saved search is showing transferring and transfered records
  - Grandle explodedDeploy target updated to copy 'web' source



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@35352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2012-04-18 08:16:09 +00:00
parent 09a0f50882
commit 4c7c011ca8
6 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -197,6 +197,7 @@ subprojects {
if (explodedWebAppDir.exists() == true) {
// copy module properties
// TODO but not so important for now
// copy jars
if (jarFileObj.exists()) {
@@ -220,6 +221,11 @@ subprojects {
// copy web
if (sourceWebObj.exists() == true) {
copy {
from sourceWebObj
into "${explodedWebAppDir}"
}
}
}
else {

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

@@ -919,6 +919,11 @@
</property>
</properties>
</aspect>
<!-- Indicates that an object is being transferred -->
<aspect name="rma:transferring">
<title>TransferringS</title>
</aspect>
<!-- Transfered marker aspect -->
<aspect name="rma:transferred">

7
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -308,7 +308,8 @@
"search" : "ISNODE:T AND NOT ASPECT:\"rma:declaredRecord\"",
"searchparams" :
{
"records" : true,
"records" : true,
"recordfolders" : false,
"undeclaredrecords" : true
}
},
@@ -325,7 +326,7 @@
{
"name" : "Records Eligible For Transfer",
"description" : "All records currently eligible for transfer.",
"search" : "dispositionActionName:\"transfer\" AND (dispositionEventsEligible:true OR dispositionActionAsOf:[MIN TO TODAY])",
"search" : "dispositionActionName:\"transfer\" AND (dispositionEventsEligible:true OR dispositionActionAsOf:[MIN TO TODAY]) AND NOT ASPECT:"rma:transferred" AND NOT ASPECT:"rma:transferring"",
"searchparams" :
{
"records" : true,
@@ -336,7 +337,7 @@
{
"name" : "Records Eligible For Destruction",
"description" : "All records currently eligible for destruction.",
"search" : "dispositionActionName:\"destroy\" AND (dispositionEventsEligible:true OR dispositionActionAsOf:[MIN TO TODAY])",
"search" : "dispositionActionName:\"destroy\" AND (dispositionEventsEligible:true OR dispositionActionAsOf:[MIN TO TODAY]) AND NOT ASPECT:\"rma:ghosted\"",
"searchparams" :
{
"records" : true,

7
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferAction.java
View File

@@ -104,7 +104,7 @@ public class TransferAction extends RMDispositionActionExecuterAbstractBase
// Get the root rm node
NodeRef root = this.recordsManagementService.getFilePlan(dispositionLifeCycleNodeRef);
// Get the hold object
// Get the transfer object
NodeRef transferNodeRef = (NodeRef)AlfrescoTransactionSupport.getResource(KEY_TRANSFER_NODEREF);
if (transferNodeRef == null)
{
@@ -139,7 +139,7 @@ public class TransferAction extends RMDispositionActionExecuterAbstractBase
AlfrescoTransactionSupport.bindResource(KEY_TRANSFER_NODEREF, transferNodeRef);
}
// Link the record to the hold
// Link the record to the trasnfer object
this.nodeService.addChild(transferNodeRef,
dispositionLifeCycleNodeRef,
ASSOC_TRANSFERRED,
@@ -148,6 +148,9 @@ public class TransferAction extends RMDispositionActionExecuterAbstractBase
// Set PDF indicator flag
setPDFIndicationFlag(transferNodeRef, dispositionLifeCycleNodeRef);
// Set the transferring indicator aspect
nodeService.addAspect(dispositionLifeCycleNodeRef, ASPECT_TRANSFERRING, null);
// Set the return value of the action
action.setParameterValue(ActionExecuter.PARAM_RESULT, transferNodeRef);
}

3
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/TransferCompleteAction.java
View File

@@ -116,6 +116,9 @@ public class TransferCompleteAction extends RMActionExecuterAbstractBase
nodeService.setProperty(da.getNodeRef(), PROP_DISPOSITION_ACTION_COMPLETED_BY, AuthenticationUtil.getRunAsUser());
}
// Remove the transferring indicator aspect
nodeService.removeAspect(nodeRef, ASPECT_TRANSFERRING);
// Determine which marker aspect to use
QName markerAspectQName = null;
if (accessionIndicator == true)

3
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
View File

@@ -188,6 +188,9 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
public static final QName PROP_TRANSFER_LOCATION = QName.createQName(RM_URI, "transferLocation");
public static final QName ASSOC_TRANSFERRED = QName.createQName(RM_URI, "transferred");
// Transferring aspect
public static final QName ASPECT_TRANSFERRING = QName.createQName(RM_URI, "transferring");
// Versioned record aspect
public static final QName ASPECT_VERSIONED_RECORD = QName.createQName(RM_URI, "versionedRecord");