Update of
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
In directory
james.mmbase.org:/tmp/cvs-serv32580/publish-remote/src/java/com/finalist/cmsc/publish
Modified Files:
Tag: b1_4
PagePublisher.java
Log Message:
CMSC-905 New draft articles get published when a page is published while
article is linked to page
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
See also: http://www.mmbase.org/jira/browse/CMSC-905
Index: PagePublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish/PagePublisher.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- PagePublisher.java 18 Feb 2008 11:05:23 -0000 1.6.2.1
+++ PagePublisher.java 15 May 2008 15:56:29 -0000 1.6.2.2
@@ -21,6 +21,7 @@
import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.cmsc.services.workflow.Workflow;
public class PagePublisher extends Publisher {
@@ -128,6 +129,9 @@
}
protected void addContentBlock(Map<Node, Date> nodes, Node content) {
+ if (Workflow.hasWorkflow(content) && !Workflow.mayPublish(content)) {
+ return;
+ }
Date contentPublishDate =
content.getDateValue(ContentElementUtil.PUBLISHDATE_FIELD);
List<Node> contentBlockNodes = findContentBlockNodes(content);
for (Node contentNode : contentBlockNodes) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
