Update of
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish
In directory
james.mmbase.org:/tmp/cvs-serv2576/publish-remote/src/java/com/finalist/cmsc/services/publish
Modified Files:
PublishServiceMMBaseImpl.java
Log Message:
CMSC-1087 changes the status box of a page to a dynamic tree in the Workflow
section of the CMSc
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish
See also: http://www.mmbase.org/jira/browse/CMSC-1087
Index: PublishServiceMMBaseImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/publish-remote/src/java/com/finalist/cmsc/services/publish/PublishServiceMMBaseImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- PublishServiceMMBaseImpl.java 1 Aug 2008 14:47:51 -0000 1.14
+++ PublishServiceMMBaseImpl.java 27 Dec 2008 11:39:48 -0000 1.15
@@ -68,13 +68,17 @@
public boolean isPublishable(Node node) {
Cloud cloud = node.getCloud();
return !TypeUtil.isSystemType(node.getNodeManager().getName())
- && (getContentPublisher(cloud).isPublishable(node) ||
getPagePublisher(cloud).isPublishable(node) || getChannelPublisher(
+ && (getAssetPublisher(cloud).isPublishable(node) ||
getContentPublisher(cloud).isPublishable(node) ||
getPagePublisher(cloud).isPublishable(node) || getChannelPublisher(
cloud).isPublishable(node));
}
private Publisher getPublisher(Node node) {
- Publisher publisher = getContentPublisher(node.getCloud());
+ Publisher publisher = getAssetPublisher(node.getCloud());
+ if (publisher.isPublishable(node)) {
+ return publisher;
+ }
+ publisher = getContentPublisher(node.getCloud());
if (publisher.isPublishable(node)) {
return publisher;
}
@@ -106,6 +110,10 @@
return new NodePublisher(cloud);
}
+ private Publisher getAssetPublisher(Cloud cloud) {
+ return new AssetPublisher(cloud);
+ }
+
private Publisher getContentPublisher(Cloud cloud) {
return new ContentPublisher(cloud);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
