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-1034 (Inbound Content Rule executes after creating a new reference)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-10-08 14:06:40 +00:00
parent 2449981609
commit 89e010401a
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-webscript-context.xml
View File

@@ -99,6 +99,7 @@
class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefPost" class="org.alfresco.module.org_alfresco_module_rm.script.CustomRefPost"
parent="rmBaseWebscript"> parent="rmBaseWebscript">
<property name="recordsManagementAdminService" ref="RecordsManagementAdminService" /> <property name="recordsManagementAdminService" ref="RecordsManagementAdminService" />
<property name="ruleService" ref="RuleService" />
</bean> </bean>
<!-- REST impl for DELETE Custom Reference Instance --> <!-- REST impl for DELETE Custom Reference Instance -->

38
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/CustomRefPost.java
View File

@@ -26,16 +26,16 @@ 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.rule.RuleService;
import org.alfresco.service.cmr.rule.RuleType;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
import org.springframework.extensions.webscripts.Cache; import org.springframework.extensions.webscripts.Cache;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONTokener;
/** /**
* Implementation for Java backed webscript to add RM custom reference instances * Implementation for Java backed webscript to add RM custom reference instances
@@ -48,15 +48,27 @@ public class CustomRefPost extends AbstractRmWebScript
private static final String TO_NODE = "toNode"; private static final String TO_NODE = "toNode";
private static final String REF_ID = "refId"; private static final String REF_ID = "refId";
@SuppressWarnings("unused") /** RM Admin Service */
private static Log logger = LogFactory.getLog(CustomRefPost.class);
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)
@@ -68,6 +80,8 @@ public class CustomRefPost extends AbstractRmWebScript
Map<String, Object> ftlModel = null; Map<String, Object> ftlModel = null;
try try
{ {
ruleService.disableRuleType(RuleType.INBOUND);
json = new JSONObject(new JSONTokener(req.getContent().getContent())); json = new JSONObject(new JSONTokener(req.getContent().getContent()));
ftlModel = addCustomReferenceInstance(req, json); ftlModel = addCustomReferenceInstance(req, json);
@@ -82,6 +96,10 @@ public class CustomRefPost extends AbstractRmWebScript
throw new WebScriptException(Status.STATUS_BAD_REQUEST, throw new WebScriptException(Status.STATUS_BAD_REQUEST,
"Could not parse JSON from req.", je); "Could not parse JSON from req.", je);
} }
finally
{
ruleService.enableRuleType(RuleType.INBOUND);
}
return ftlModel; return ftlModel;
} }