diff --git a/source/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java b/source/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java index 6ab59d722b..bb9ecf895a 100644 --- a/source/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java +++ b/source/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java @@ -22,7 +22,6 @@ import org.springframework.extensions.surf.util.I18NUtil; public class WorkflowTaskNode extends TransientMapNode { private static final long serialVersionUID = 1L; - private static final String DEFAULT_TRANSITION_TITLE = "bpm_businessprocessmodel.transition.title"; private Map propertyWrapper; private WorkflowTask workflowTask; @@ -58,13 +57,11 @@ public class WorkflowTaskNode extends TransientMapNode { { outcome = transition; } + if (outcome != null) + { + propertyWrapper.put("outcome", outcome); + } } - //ACE-1154 - if (outcome == null) - { - outcome = I18NUtil.getMessage(DEFAULT_TRANSITION_TITLE); - } - propertyWrapper.put("outcome", outcome); // add the workflow instance id and name this taks belongs to propertyWrapper.put("workflowInstanceId", workflowTask.getPath().getInstance().getId()); diff --git a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java index fce28bcfb8..a2b1545881 100644 --- a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java +++ b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java @@ -41,7 +41,6 @@ import org.alfresco.web.ui.common.Utils; import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.extensions.surf.util.I18NUtil; /** * JSF component that displays historic information about a workflow. @@ -54,7 +53,6 @@ public class UIWorkflowHistory extends SelfRenderingComponent private static final Log logger = LogFactory.getLog(UIWorkflowHistory.class); - private static final String DEFAULT_TRANSITION_TITLE = "bpm_businessprocessmodel.transition.title"; private static final String MSG_DESCRIPTION = "description"; private static final String MSG_TASK = "task_type"; private static final String MSG_ID = "id"; @@ -202,11 +200,6 @@ public class UIWorkflowHistory extends SelfRenderingComponent // in this case default to the transition, if there is one. outcome = transition; } - //ACE-1154 - if (outcome.equals("")) - { - outcome = I18NUtil.getMessage(DEFAULT_TRANSITION_TITLE); - } out.write(""); out.write(desc == null ? "" : Utils.encode(desc));