From afecd1fe0cc3a03e7e0e91af66d880f3b0efdd70 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 5 Oct 2017 17:15:23 +0000
Subject: [PATCH] CCM NG: Finish task link in Content Item editor is back

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5029 8810af33-2d31-482b-a856-94f89814c4df
---
 .../cms/ui/workflow/AssignedTaskController.java  |  9 ++++++++-
 .../workflow/AssignedTaskTableModelBuilder.java  | 16 +++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskController.java
index f48da5e0b..e164263da 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskController.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskController.java
@@ -28,6 +28,8 @@ import org.libreccm.workflow.AssignableTask;
 import org.libreccm.workflow.AssignableTaskRepository;
 import org.libreccm.workflow.Workflow;
 import org.libreccm.workflow.WorkflowManager;
+import org.librecms.workflow.CmsTask;
+import org.librecms.workflow.CmsTaskType;
 
 import java.util.List;
 import java.util.Locale;
@@ -95,7 +97,12 @@ public class AssignedTaskController {
             rowData.setColData(1, "");
         }
 
-        rowData.setColData(2, "");
+        if (task instanceof CmsTask
+                && ((CmsTask) task).getTaskType() == CmsTaskType.DEPLOY) {
+            rowData.setColData(2, null);
+        } else {
+            rowData.setColData(2, "cms.ui.workflow.task.finish");
+        }
 
         return rowData;
     }
diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java
index e9d603e8f..872d8d8af 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java
@@ -14,6 +14,8 @@
  */
 package com.arsdigita.cms.ui.workflow;
 
+import com.arsdigita.bebop.ControlLink;
+import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.Table;
 import com.arsdigita.bebop.table.AbstractTableModelBuilder;
@@ -25,11 +27,11 @@ import com.arsdigita.util.Assert;
 
 import org.libreccm.cdi.utils.CdiUtil;
 import org.libreccm.workflow.Workflow;
-import org.libreccm.workflow.WorkflowManager;
 import org.librecms.CmsConstants;
 
 import java.util.Collections;
 import java.util.Iterator;
+
 import org.libreccm.workflow.WorkflowState;
 
 class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder {
@@ -43,7 +45,8 @@ class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder {
 
     @Override
     public TableModel makeModel(final Table table, final PageState state) {
-        return new AssignedTaskTableModel(workflowRequestLocal.getWorkflow(state));
+        return new AssignedTaskTableModel(workflowRequestLocal
+            .getWorkflow(state));
     }
 
     private static class AssignedTaskTableModel implements TableModel {
@@ -95,7 +98,14 @@ class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder {
                 case 1:
                     return rowData.getColData(1);
                 case 2:
-                    return rowData.getColData(2);
+//                    return rowData.getColData(2);
+                    if (rowData.getColData(2) == null) {
+                        return "";
+                    } else {
+//                        return rowData.getColData(2);
+                        return new ControlLink(new Label(new GlobalizedMessage(
+                            rowData.getColData(2), CmsConstants.CMS_BUNDLE)));
+                    }
                 default:
                     throw new IllegalArgumentException(String.format(
                         "Illegal column index %d. Valid column index: 0, 1, 2",