Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory
james.mmbase.org:/tmp/cvs-serv9194/src/java/com/finalist/newsletter/tree
Modified Files:
Tag: b1_5
NewsletterPublicationTreeItemRenderer.java
Log Message:
CMSC-1149(add functionality to approve and revoke a newsletter edition)
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-1149
Index: NewsletterPublicationTreeItemRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterPublicationTreeItemRenderer.java,v
retrieving revision 1.16.2.3
retrieving revision 1.16.2.4
diff -u -b -r1.16.2.3 -r1.16.2.4
--- NewsletterPublicationTreeItemRenderer.java 12 Nov 2008 06:55:21 -0000
1.16.2.3
+++ NewsletterPublicationTreeItemRenderer.java 14 Nov 2008 06:59:39 -0000
1.16.2.4
@@ -1,5 +1,6 @@
package com.finalist.newsletter.tree;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.Node;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -12,6 +13,7 @@
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.domain.Publication;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
import com.finalist.tree.TreeElement;
@@ -73,8 +75,18 @@
element.addOption(renderer.createTreeOption("mail.png",
"site.newsletteredition.publish", "newsletter",
"../workflow/publish.jsp?number=" + id));
}
+ if (SecurityUtil.isWebmaster(role)) {
+ String status =
NewsletterPublicationUtil.getEditionStatus(Integer.valueOf(id));
+ if(EditionStatus.INITIAL.value().equals(status)) {
+ element.addOption(renderer.createTreeOption("arrow_right.png",
"site.newsletteredition.freeze", "newsletter",
+ "../newsletter/NewsletterEditionFreeze.do?number=" + id));
+ }
+ if(EditionStatus.FROZEN.value().equals(status)) {
+ element.addOption(renderer.createTreeOption("arrow_undo.png",
"site.newsletteredition.defrost", "newsletter",
+ "../newsletter/NewsletterEditionDefrost.do?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
