LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

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
jensp 2017-10-05 17:15:23 +00:00
parent 993ddd406e
commit bea101b4a7
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskController.java
View File

@ -28,6 +28,8 @@ import org.libreccm.workflow.AssignableTask;
import org.libreccm.workflow.AssignableTaskRepository; import org.libreccm.workflow.AssignableTaskRepository;
import org.libreccm.workflow.Workflow; import org.libreccm.workflow.Workflow;
import org.libreccm.workflow.WorkflowManager; import org.libreccm.workflow.WorkflowManager;
import org.librecms.workflow.CmsTask;
import org.librecms.workflow.CmsTaskType;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -95,7 +97,12 @@ public class AssignedTaskController {
rowData.setColData(1, ""); 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; return rowData;
} }

16
ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTableModelBuilder.java
View File

@ -14,6 +14,8 @@
*/ */
package com.arsdigita.cms.ui.workflow; 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.PageState;
import com.arsdigita.bebop.Table; import com.arsdigita.bebop.Table;
import com.arsdigita.bebop.table.AbstractTableModelBuilder; import com.arsdigita.bebop.table.AbstractTableModelBuilder;
@ -25,11 +27,11 @@ import com.arsdigita.util.Assert;
import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.cdi.utils.CdiUtil;
import org.libreccm.workflow.Workflow; import org.libreccm.workflow.Workflow;
import org.libreccm.workflow.WorkflowManager;
import org.librecms.CmsConstants; import org.librecms.CmsConstants;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import org.libreccm.workflow.WorkflowState; import org.libreccm.workflow.WorkflowState;
class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder { class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder {
@ -43,7 +45,8 @@ class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder {
@Override @Override
public TableModel makeModel(final Table table, final PageState state) { 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 { private static class AssignedTaskTableModel implements TableModel {
@ -95,7 +98,14 @@ class AssignedTaskTableModelBuilder extends AbstractTableModelBuilder {
case 1: case 1:
return rowData.getColData(1); return rowData.getColData(1);
case 2: 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: default:
throw new IllegalArgumentException(String.format( throw new IllegalArgumentException(String.format(
"Illegal column index %d. Valid column index: 0, 1, 2", "Illegal column index %d. Valid column index: 0, 1, 2",