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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
66052: ACE-1154: Outcome of the Review and Approve task is not displayed in the "My Completed Task" component.
   Reverse Merge: unapproved solution was committed to the head branch but should to dev firstly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-04-02 22:38:24 +00:00
parent 330a5c3465
commit 6c50dfa622
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/web/bean/workflow/WorkflowTaskNode.java
View File

@@ -22,7 +22,6 @@ import org.springframework.extensions.surf.util.I18NUtil;
public class WorkflowTaskNode extends TransientMapNode { public class WorkflowTaskNode extends TransientMapNode {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String DEFAULT_TRANSITION_TITLE = "bpm_businessprocessmodel.transition.title";
private Map<String, Object> propertyWrapper; private Map<String, Object> propertyWrapper;
private WorkflowTask workflowTask; private WorkflowTask workflowTask;
@@ -58,13 +57,11 @@ public class WorkflowTaskNode extends TransientMapNode {
{ {
outcome = transition; outcome = transition;
} }
} if (outcome != null)
//ACE-1154
if (outcome == null)
{ {
outcome = I18NUtil.getMessage(DEFAULT_TRANSITION_TITLE);
}
propertyWrapper.put("outcome", outcome); propertyWrapper.put("outcome", outcome);
}
}
// add the workflow instance id and name this taks belongs to // add the workflow instance id and name this taks belongs to
propertyWrapper.put("workflowInstanceId", workflowTask.getPath().getInstance().getId()); propertyWrapper.put("workflowInstanceId", workflowTask.getPath().getInstance().getId());

7
source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
View File

@@ -41,7 +41,6 @@ import org.alfresco.web.ui.common.Utils;
import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent; import org.springframework.extensions.webscripts.ui.common.component.SelfRenderingComponent;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.I18NUtil;
/** /**
* JSF component that displays historic information about a workflow. * 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 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_DESCRIPTION = "description";
private static final String MSG_TASK = "task_type"; private static final String MSG_TASK = "task_type";
private static final String MSG_ID = "id"; 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. // in this case default to the transition, if there is one.
outcome = transition; outcome = transition;
} }
//ACE-1154
if (outcome.equals(""))
{
outcome = I18NUtil.getMessage(DEFAULT_TRANSITION_TITLE);
}
out.write("<tr><td>"); out.write("<tr><td>");
out.write(desc == null ? "" : Utils.encode(desc)); out.write(desc == null ? "" : Utils.encode(desc));