RM-1051 (Outbound rule is executed when record references are deleted)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-10-08 12:18:21 +00:00
parent f05f51b4c5
commit a685372a15
2 changed files with 41 additions and 12 deletions

View File

@@ -106,6 +106,7 @@
class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefDelete" class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefDelete"
parent="rmBaseWebscript"> parent="rmBaseWebscript">
<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" /> <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
<property name="ruleService" ref="RuleService" />
</bean> </bean>
<!-- REST impl for GET Disposition Schedule --> <!-- REST impl for GET Disposition Schedule -->

View File

@@ -26,6 +26,8 @@ import javax.servlet.http.HttpServletResponse;
import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService; import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.rule.RuleService;
import org.alfresco.service.cmr.rule.RuleType;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
@@ -42,22 +44,48 @@ import org.apache.commons.logging.LogFactory;
*/ */
public class CustomRefDelete extends AbstractRmWebScript public class CustomRefDelete extends AbstractRmWebScript
{ {
/** Logger */
private static Log logger = LogFactory.getLog(CustomRefDelete.class); private static Log logger = LogFactory.getLog(CustomRefDelete.class);
/** RM Admin Service */
private RecordsManagementAdminService rmAdminService; private RecordsManagementAdminService rmAdminService;
/** Rule Service */
private RuleService ruleService;
/**
* @param rmAdminService RM Admin Service
*/
public void setRecordsManagementAdminService(RecordsManagementAdminService rmAdminService) public void setRecordsManagementAdminService(RecordsManagementAdminService rmAdminService)
{ {
this.rmAdminService = rmAdminService; this.rmAdminService = rmAdminService;
} }
/**
* @param ruleService Rule Service
*/
public void setRuleService(RuleService ruleService)
{
this.ruleService = ruleService;
}
/* /*
* @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status, org.alfresco.web.scripts.Cache) * @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status, org.alfresco.web.scripts.Cache)
*/ */
@Override @Override
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache) protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache)
{ {
Map<String, Object> ftlModel = removeCustomReferenceInstance(req); Map<String, Object> ftlModel;
ruleService.disableRuleType(RuleType.OUTBOUND);
try
{
ftlModel = removeCustomReferenceInstance(req);
}
finally
{
ruleService.enableRuleType(RuleType.OUTBOUND);
}
return ftlModel; return ftlModel;
} }