Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory
james.mmbase.org:/tmp/cvs-serv26065/java/com/finalist/newsletter/tree
Modified Files:
Tag: b1_5
NewsletterPublicationTreeItemRenderer.java
Log Message:
CMSC-1146 Newsletter: add functionality to freeze and defrost a newsletter
edition add fresh function ,escape html and gray the edited icon
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-1146
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.5
retrieving revision 1.16.2.6
diff -u -b -r1.16.2.5 -r1.16.2.6
--- NewsletterPublicationTreeItemRenderer.java 14 Nov 2008 07:30:10 -0000
1.16.2.5
+++ NewsletterPublicationTreeItemRenderer.java 26 Nov 2008 09:10:54 -0000
1.16.2.6
@@ -40,10 +40,16 @@
String id = String.valueOf(parentNode.getNumber());
TreeElement element = renderer.createElement(parentNode, role, name,
fragment, secure);
-
+ String process_status =
NewsletterPublicationUtil.getEditionStatus(Integer.valueOf(id));
if (SecurityUtil.isEditor(role)) {
+ if(EditionStatus.INITIAL.value().equals(process_status)) {
element.addOption(renderer.createTreeOption("edit_defaults.png",
"site.newsletteredition.edit", "newsletter",
"../newsletter/NewsletterPublicationEdit.do?number=" + id));
+ }
+ else {
+
element.addOption(renderer.createTreeOption("edit_defaults_gray.gif",
"site.newsletteredition.edit", "newsletter",
+ ""));
+ }
boolean isSingleApplication = true;
boolean isPublished;
@@ -76,12 +82,11 @@
"../workflow/publish.jsp?number=" + id));
}
if (SecurityUtil.isWebmaster(role)) {
- String status =
NewsletterPublicationUtil.getEditionStatus(Integer.valueOf(id));
- if(EditionStatus.INITIAL.value().equals(status)) {
+ if(EditionStatus.INITIAL.value().equals(process_status)) {
element.addOption(renderer.createTreeOption("status_finished.png",
"site.newsletteredition.freeze", "newsletter",
"../newsletter/NewsletterEditionFreeze.do?number=" + id));
}
- if(EditionStatus.FROZEN.value().equals(status)) {
+ if(EditionStatus.FROZEN.value().equals(process_status)) {
element.addOption(renderer.createTreeOption("status_approved.png",
"site.newsletteredition.defrost", "newsletter",
"../newsletter/NewsletterEditionDefrost.do?number=" + id));
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
