Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree
In directory
james.mmbase.org:/tmp/cvs-serv25512/java/com/finalist/newsletter/tree
Modified Files:
Tag: b1_5
NewsletterPublicationTreeItemRenderer.java
NewsletterTreeItemRenderer.java
Log Message:
CMSC-1178 Newsletter: add mechanism to use restrictions in the newsletter
edition workflow
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-1178
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.10
retrieving revision 1.16.2.11
diff -u -b -r1.16.2.10 -r1.16.2.11
--- NewsletterPublicationTreeItemRenderer.java 11 Dec 2008 06:56:43 -0000
1.16.2.10
+++ NewsletterPublicationTreeItemRenderer.java 11 Dec 2008 07:22:07 -0000
1.16.2.11
@@ -59,7 +59,7 @@
log.debug("Publication " + parentNode.getNumber() + "'s publication
status:" + isPublished + " in single:" + isSingleApplication);
- if (SecurityUtil.isWebmaster(role) ||
(model.getChildCount(parentNode) == 0 && !isPublished &&
SecurityUtil.isEditor(role))) {
+ if (SecurityUtil.isChiefEditor(role) ||
(model.getChildCount(parentNode) == 0 && !isPublished &&
SecurityUtil.isEditor(role))) {
element.addOption(renderer.createTreeOption("delete.png",
"site.newsletteredition.remove", "newsletter",
"../newsletter/NewsletterPublicationDelete.do?number=" +
id));
}
Index: NewsletterTreeItemRenderer.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/tree/NewsletterTreeItemRenderer.java,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -b -r1.19.2.5 -r1.19.2.6
--- NewsletterTreeItemRenderer.java 14 Nov 2008 10:12:48 -0000 1.19.2.5
+++ NewsletterTreeItemRenderer.java 11 Dec 2008 07:22:07 -0000 1.19.2.6
@@ -58,6 +58,11 @@
}
private void addChiefEditorOptions(NavigationRenderer renderer, String id,
TreeElement element) {
+ element.addOption(
+ renderer.createTreeOption("delete.png", "site.newsletter.remove",
"newsletter",
+ "../newsletter/NewsletterDelete.do?number=" + id
+ )
+ );
element.addOption(renderer.createTreeOption("cut.png", "site.page.cut",
"javascript:cut('" + id + "');"));
element.addOption(renderer.createTreeOption("copy.png",
"site.page.copy", "javascript:copy('" + id + "');"));
element.addOption(renderer.createTreeOption("paste.png",
"site.page.paste", "javascript:paste('" + id + "');"));
@@ -88,11 +93,7 @@
}
private void addWebmasterOptions(NavigationRenderer renderer, String id,
TreeElement element) {
- element.addOption(
- renderer.createTreeOption("delete.png",
"site.newsletter.remove", "newsletter",
- "../newsletter/NewsletterDelete.do?number=" + id
- )
- );
+
//todo remove the code
//This has been implement in the wizard.
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
