Update of
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow
In directory
james.mmbase.org:/tmp/cvs-serv4354/workflow/src/java/com/finalist/cmsc/services/workflow
Modified Files:
WorkflowServiceMMBaseImpl.java
Log Message:
CMSC-1016 Only publish contentelements with pages when they are accepted
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1016
Index: WorkflowServiceMMBaseImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/services/workflow/WorkflowServiceMMBaseImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WorkflowServiceMMBaseImpl.java 26 Nov 2007 11:42:15 -0000 1.7
+++ WorkflowServiceMMBaseImpl.java 14 Jul 2008 11:59:38 -0000 1.8
@@ -24,51 +24,60 @@
public class WorkflowServiceMMBaseImpl extends WorkflowService {
+ @Override
public Node create(Node node, String remark) {
return getManager(node).createFor(node, remark);
}
+ @Override
public Node create(Node node, String remark, List<Node> nodeList) {
return getManager(node).createFor(node, remark, nodeList);
}
+ @Override
public void finish(Node node, String remark) {
getManager(node).finishWriting(node, remark);
}
+ @Override
public void accept(Node node, String remark) {
if (isAcceptedStepEnabled()) {
getManager(node).accept(node, remark);
}
else {
- getManager(node).complete(node);
+ getManager(node).finishWriting(node, remark);
}
}
+ @Override
public void reject(Node node, String remark) {
getManager(node).reject(node, remark);
}
+ @Override
public void publish(Node node) throws WorkflowException {
getManager(node).publish(node);
}
+ @Override
public void publish(Node node, List<Integer> publishNumbers) throws
WorkflowException {
getManager(node).publish(node, publishNumbers);
}
+ @Override
public void complete(Node node) {
getManager(node).complete(node);
}
+ @Override
public void remove(Node node) {
getManager(node).remove(node);
}
@@ -134,6 +143,7 @@
}
+ @Override
public boolean isWorkflowElement(Node node) {
Cloud cloud = node.getCloud();
return getContentWorkflow(cloud).isWorkflowElement(node, false)
@@ -204,17 +214,34 @@
}
+ @Override
+ public boolean isAccepted(Node node) {
+ if (hasWorkflow(node)) {
+ String status = getStatus(node);
+ if (isAcceptedStepEnabled()) {
+ return WorkflowManager.STATUS_PUBLISHED.equals(status)
+ || WorkflowManager.STATUS_APPROVED.equals(status);
+ }
+ else {
+ return WorkflowManager.STATUS_PUBLISHED.equals(status);
+ }
+ }
+ return true;
+ }
+
+
+ @Override
protected Log getLogger() {
return LogFactory.getLog(WorkflowServiceMMBaseImpl.class);
}
+ @Override
public WorkflowStatusInfo getStatusInfo(Cloud cloud) {
Query statusQuery = WorkflowManager.createStatusQuery(cloud);
NodeList statusList = cloud.getList(statusQuery);
- WorkflowStatusInfo ststusInfo = new WorkflowStatusInfo(statusList);
- return ststusInfo;
+ return new WorkflowStatusInfo(statusList);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
