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-7051 updating code to deal with held content after 3.2 change

Browse Source
This commit is contained in:
Ross Gale
2019-12-04 14:01:54 +00:00
parent f42cd05af3
commit 4de8b50e4d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
View File

@@ -694,6 +694,8 @@
<property name="recordService" ref="recordService"/> <property name="recordService" ref="recordService"/>
<property name="recordsManagementQueryDAO" ref="recordsManagementQueryDAO"/> <property name="recordsManagementQueryDAO" ref="recordsManagementQueryDAO"/>
<property name="behaviourFilter" ref="policyBehaviourFilter" /> <property name="behaviourFilter" ref="policyBehaviourFilter" />
<property name="frozenAspect" ref="rma.freeze"/>
<property name="recordsManagementSearchBehaviour" ref="recordsManagementSearchBehaviour"/>
</bean> </bean>
</beans> </beans>

21
rm-community/rm-community-repo/source/java/org/alfresco/repo/web/scripts/schedule/UpdateRecordScheduleGet.java
View File

@@ -59,6 +59,8 @@ import javax.servlet.http.HttpServletResponse;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RecordsManagementSearchBehaviour;
import org.alfresco.module.org_alfresco_module_rm.model.rma.aspect.FrozenAspect;
import org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAO; import org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAO;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService; import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.node.NodeDAO;
@@ -115,7 +117,8 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
private BehaviourFilter behaviourFilter; private BehaviourFilter behaviourFilter;
private NodeDAO nodeDAO; private NodeDAO nodeDAO;
private QNameDAO qnameDAO; private QNameDAO qnameDAO;
private FrozenAspect frozenAspect;
private RecordsManagementSearchBehaviour recordsManagementSearchBehaviour;
/** /**
* service setters * service setters
*/ */
@@ -159,6 +162,16 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
this.qnameDAO = qnameDAO; this.qnameDAO = qnameDAO;
} }
public void setFrozenAspect(FrozenAspect frozenAspect)
{
this.frozenAspect = frozenAspect;
}
public void setRecordsManagementSearchBehaviour(RecordsManagementSearchBehaviour recordsManagementSearchBehaviour)
{
this.recordsManagementSearchBehaviour = recordsManagementSearchBehaviour;
}
/** /**
* Build web script model * Build web script model
*/ */
@@ -377,8 +390,7 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
public Integer execute() throws Throwable public Integer execute() throws Throwable
{ {
int recordCount = 0; int recordCount = 0;
frozenAspect.disableOnPropUpdateFrozenAspect();
behaviourFilter.disableBehaviour(ASPECT_FILE_PLAN_COMPONENT);
try try
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
@@ -409,6 +421,7 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
// update record disposition information // update record disposition information
dispositionService.updateNextDispositionAction(record, schedule); dispositionService.updateNextDispositionAction(record, schedule);
recordsManagementSearchBehaviour.onAddDispositionLifecycleAspect(record,null);
innerRecordCount++; innerRecordCount++;
} }
} }
@@ -421,7 +434,7 @@ public class UpdateRecordScheduleGet extends AbstractWebScript implements Record
} }
finally finally
{ {
behaviourFilter.enableBehaviour(ASPECT_FILE_PLAN_COMPONENT); frozenAspect.enableOnPropUpdateFrozenAspect();
} }
return recordCount; return recordCount;
} }