inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-541 (Error shown in firebug when the details page of a record is open)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0-BUG-FIX@43623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2012-11-15 13:51:25 +00:00
parent c9ad4c8f3d
commit 08cc495c65
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/dispositionlifecycle.get.json.ftl
View File

@@ -2,6 +2,10 @@
{ {
"data": "data":
{ {
<#if nextaction.notFound?? && nextaction.notFound>
"notFound": ${nextaction.notFound?string},
"message": "${nextaction.message}"
<#else>
"url": "${nextaction.url}", "url": "${nextaction.url}",
"name": "${nextaction.name}", "name": "${nextaction.name}",
"label": "${nextaction.label}", "label": "${nextaction.label}",
@@ -30,6 +34,7 @@
}<#if event_has_next>,</#if> }<#if event_has_next>,</#if>
</#list> </#list>
] ]
</#if>
} }
} }
</#escape> </#escape>

11
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DispositionLifecycleGet.java
View File

@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction;
import org.alfresco.module.org_alfresco_module_rm.event.EventCompletionDetails; import org.alfresco.module.org_alfresco_module_rm.event.EventCompletionDetails;
@@ -68,9 +66,12 @@ public class DispositionLifecycleGet extends DispositionAbstractBase
DispositionAction nextAction = this.dispositionService.getNextDispositionAction(nodeRef); DispositionAction nextAction = this.dispositionService.getNextDispositionAction(nodeRef);
if (nextAction == null) if (nextAction == null)
{ {
status.setCode(HttpServletResponse.SC_NOT_FOUND, Map<String, Object> nextActionModel = new HashMap<String, Object>(2);
"Node " + nodeRef.toString() + " does not have a disposition lifecycle"); nextActionModel.put("notFound", true);
return null; nextActionModel.put("message", "Node " + nodeRef.toString() + " does not have a disposition lifecycle");
Map<String, Object> model = new HashMap<String, Object>(1);
model.put("nextaction", nextActionModel);
return model;
} }
else else
{ {