Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory
james.mmbase.org:/tmp/cvs-serv2264/portlets-newsletter/src/java/com/finalist/newsletter/tree
Modified Files:
NewsletterPublicationTreeItemRenderer.java
Log Message:
CMSC-703 change tag to term
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
See also: http://www.mmbase.org/jira/browse/CMSC-703
Index: NewsletterPublicationTreeItemRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- NewsletterPublicationTreeItemRenderer.java 15 Apr 2008 08:40:24 -0000
1.10
+++ NewsletterPublicationTreeItemRenderer.java 29 Apr 2008 01:37:04 -0000
1.11
@@ -1,20 +1,24 @@
package com.finalist.newsletter.tree;
import org.mmbase.bridge.Node;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.navigation.NavigationRenderer;
-import com.finalist.cmsc.navigation.NavigationTreeItemRenderer;
-import com.finalist.cmsc.navigation.NavigationUtil;
-import com.finalist.cmsc.navigation.PagesUtil;
+import com.finalist.cmsc.navigation.*;
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.services.publish.Publish;
import com.finalist.tree.TreeElement;
import com.finalist.tree.TreeModel;
import com.finalist.util.module.ModuleUtil;
+import com.finalist.newsletter.services.NewsletterServiceFactory;
+import com.finalist.newsletter.domain.Publication;
+
public class NewsletterPublicationTreeItemRenderer implements
NavigationTreeItemRenderer {
+ private static Logger log =
Logging.getLoggerInstance(NewsletterPublicationTreeItemRenderer.class.getName());
+
protected static final String FEATURE_WORKFLOW = "workflowitem";
@SuppressWarnings("unused")
@@ -36,16 +40,24 @@
element.addOption(renderer.createTreeOption("edit_defaults.png",
"site.newsletterpublication.edit", "newsletter",
"../newsletter/NewsletterPublicationEdit.do?number=" + id));
- if (SecurityUtil.isWebmaster(role) ||
(model.getChildCount(parentNode) == 0 && !Publish.isPublished(parentNode))) {
+ boolean isSingleApplication = true;
+ boolean isPublished;
+
+ if (isSingleApplication) {
+ Publication.STATUS status =
NewsletterServiceFactory.getNewsletterPublicationService().getStatus(parentNode.getNumber());
+ isPublished = Publication.STATUS.DELIVERED.equals(status);
+ }
+ else {
+ isPublished = Publish.isPublished(parentNode);
+ }
+
+ log.debug("Publication "+parentNode.getNumber()+"'s publication
status:"+isPublished+" in single:"+isSingleApplication);
+
+ if (SecurityUtil.isWebmaster(role) ||
(model.getChildCount(parentNode) == 0 && !isPublished)) {
element.addOption(renderer.createTreeOption("delete.png",
"site.newsletterpublication.remove", "newsletter",
"../newsletter/NewsletterPublicationDelete.do?number=" +
id));
- // element.addOption(renderer.createTreeOption("mail.png",
"site.newsletterpublication.publish", "newsletter",
- // "../newsletter/NewsletterPublicationPublish.do?number=" +
id));
- /*
- element.addOption(renderer.createTreeOption("mail.png",
"site.newsletterpublication.test", "newsletter",
- "../newsletter/NewsletterPublicationTest.do?number=" + id));
- */
-
+ element.addOption(renderer.createTreeOption("mail.png",
"site.newsletterpublication.publish", "newsletter",
+ "../newsletter/NewsletterPublicationPublish.do?number=" +
id));
element.addOption(renderer.createTreeOption("mail.png",
"site.newsletterpublication.test", "newsletter",
"../newsletter/NewsletterPublicationTest.do?number=" + id));
}
@@ -59,6 +71,7 @@
"../workflow/publish.jsp?number=" + id));
}
}
+
element.addOption(renderer.createTreeOption("rights.png",
"site.page.rights", "../usermanagement/pagerights.jsp?number=" + id));
return element;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
