Update of
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish
In directory
james.mmbase.org:/tmp/cvs-serv4354/publish-remote/src/java/com/finalist/cmsc/publish
Modified Files:
PagePublisher.java
Log Message:
CMSC-1016 Only publish contentelements with pages when they are accepted
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-1016
Index: PagePublisher.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/publish/PagePublisher.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- PagePublisher.java 16 May 2008 11:45:45 -0000 1.10
+++ PagePublisher.java 14 Jul 2008 11:59:38 -0000 1.11
@@ -17,7 +17,8 @@
import org.mmbase.storage.search.Step;
import com.finalist.cmsc.mmbase.TypeUtil;
-import com.finalist.cmsc.navigation.*;
+import com.finalist.cmsc.navigation.PagesUtil;
+import com.finalist.cmsc.navigation.PortletUtil;
import com.finalist.cmsc.repository.ContentElementUtil;
import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.services.publish.Publish;
@@ -66,6 +67,9 @@
}
if (ContentElementUtil.isContentElement(valueNode)) {
if (!isPublished(valueNode)) {
+ if (Workflow.hasWorkflow(valueNode) &&
!Workflow.mayPublish(valueNode)) {
+ continue;
+ }
NodeList channels =
RepositoryUtil.getContentChannelsForContent(valueNode);
for (Iterator<Node> iter = channels.iterator();
iter.hasNext();) {
Node channel = iter.next();
@@ -89,16 +93,24 @@
NodeList contentNodes = getContentElements(valueNode, date);
for (Iterator<Node> iter = contentNodes.iterator();
iter.hasNext();) {
Node contentElement = iter.next();
+
+ boolean hasWorkflow = Workflow.hasWorkflow(contentElement);
+ if (!hasWorkflow || (hasWorkflow &&
Workflow.isAccepted(contentElement))) {
addContentBlock(nodes, contentElement);
}
}
+ }
else {
NodeList contentNodes = getContentElements(valueNode, date);
for (Iterator<Node> iter = contentNodes.iterator();
iter.hasNext();) {
Node contentElement = iter.next();
if (!isPublished(contentElement)) {
+ boolean hasWorkflow = Workflow.hasWorkflow(contentElement);
+ if (!hasWorkflow || (hasWorkflow &&
Workflow.isAccepted(contentElement))) {
addContentBlock(nodes, contentElement);
}
+
+ }
}
}
}
@@ -128,9 +140,6 @@
}
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
