Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv25512/webapp/editors/newsletter/module
Modified Files:
Tag: b1_5
report_newsletter_overview_list.jsp
report_publication_edit.jsp
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/webapp/editors/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-1178
Index: report_newsletter_overview_list.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_overview_list.jsp,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- report_newsletter_overview_list.jsp 4 Nov 2008 05:04:15 -0000 1.5.2.3
+++ report_newsletter_overview_list.jsp 11 Dec 2008 07:22:07 -0000 1.5.2.4
@@ -19,9 +19,15 @@
<input type="checkbox" name="ids"
value="${result.id}"/>
</td>
<td>
+ <cmsc:rights nodeNumber="${result.id}" var="rights"/>
+
<a
href="../site/NavigatorPanel.do?nodeId=${result.id}"><img height="16"
width="16" title="<fmt:message key='newsletter.icons.title.editproperty'/>"
src="../gfx/icons/edit.gif"/></a>
+ <c:if test="${rights == 'chiefeditor' || rights ==
'webmaster'}">
<a href="javascript:ask('${result.id}')"><img
src="../gfx/icons/delete.png" align="top" title="<fmt:message
key='site.newsletter.remove'/>"/></a>
+ </c:if>
+ <c:if test="${rights == 'chiefeditor' || rights ==
'editor' || rights == 'webmaster'}">
<a
href="NewsletterEdit.do?number=${result.id}&forward=manage"><img
src="../gfx/icons/edit_defaults.png" align="top" title="<fmt:message
key='site.newsletter.edit'/>"/></a>
+ </c:if>
</td>
<td>
<a
href="NewsletterPublicationManagement.do?newsletterId=${result.id}">
Index: report_publication_edit.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp,v
retrieving revision 1.7.2.12
retrieving revision 1.7.2.13
diff -u -b -r1.7.2.12 -r1.7.2.13
--- report_publication_edit.jsp 26 Nov 2008 10:05:27 -0000 1.7.2.12
+++ report_publication_edit.jsp 11 Dec 2008 07:22:07 -0000 1.7.2.13
@@ -52,24 +52,31 @@
<div class="body">
<edit:ui-table items="${results}" var="result" size="${resultCount}"
requestURI="/editors/newsletter/NewsletterPublicationManagement.do">
<edit:ui-tcolumn title="" width="5%"><nobr>
+ <cmsc:rights nodeNumber="${result.id}" var="rights"/>
<c:if test="${result.process_status == 'concept edition'}">
<a href="../site/NavigatorPanel.do?nodeId=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/edit.gif'/>" width="16"
height="16" title="<fmt:message
key='newsletter.icons.title.editproperty'/>"></a>
</c:if>
<c:if test="${result.process_status != 'concept edition'}">
<img src="<cmsc:staticurl
page='/editors/gfx/icons/edit_gray.gif'/>" width="16" height="16"
title="<fmt:message key='newsletter.icons.title.editproperty'/>">
</c:if>
+ <c:if test="${rights == 'chiefeditor' || rights ==
'webmaster'}">
<a
href="../newsletter/NewsletterPublicationDelete.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=publicationedit"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message key='site.newsletteredition.remove'/>"></a>
+ </c:if>
+ <c:if test="${rights == 'chiefeditor' || rights == 'webmaster'
|| rights == 'editor' }">
<a
href="../newsletter/NewsletterPublicationEdit.do?number=${result.id}&parent=${requestScope.newsletterId}&forward=publicationedit"><img
src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16"
height="16" title="<fmt:message key='site.newsletteredition.edit'/>"></a>
+ </c:if>
+ <c:if test="${rights == 'chiefeditor' || rights == 'webmaster'
|| rights == 'editor' || rights == 'writer' }">
<a
href="../newsletter/NewsletterPublicationTest.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/type/email_go.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.sendemail'/>"></a>
<a
href="../newsletter/NewsletterPublicationPublish.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/type/email_error.png'/>"
width="16" height="16" title="<fmt:message
key='newsletter.icons.title.sendedition'/>"></a>
- <c:if test="${result.process_status == 'concept edition'}">
+ </c:if>
+ <c:if test="${result.process_status == 'concept edition' &&
(rights == 'chiefeditor' || rights == 'webmaster' || rights == 'editor' ||
rights == 'writer')}">
<a
href="../newsletter/NewsletterEditionFreeze.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/status_finished.png'/>"
width="16" height="16" title="<fmt:message
key='site.newsletteredition.freeze'/>"></a>
</c:if>
- <c:if test="${result.process_status == 'Frozen'}">
+ <c:if test="${result.process_status == 'Frozen' && (rights ==
'chiefeditor' || rights == 'webmaster' || rights == 'editor' || rights ==
'writer')}">
<a
href="../newsletter/NewsletterEditionDefrost.do?number=${result.id}&forward=publicationedit&newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/status_approved.png'/>"
width="16" height="16" title="<fmt:message
key='site.newsletteredition.defrost'/>"></a>
<a
href="../newsletter/NewsletterEditionApprove.do?number=${result.id}&newsletterId=${requestScope.newsletterId}&forward=publicationedit"><img
src="<cmsc:staticurl page='/editors/gfx/icons/status_published.png'/>"
width="16" height="16" title="<fmt:message
key='site.newsletteredition.approve'/>"></a>
</c:if>
- <c:if test="${result.process_status=='Approved'}">
+ <c:if test="${result.process_status=='Approved' && (rights ==
'chiefeditor' || rights == 'webmaster' || rights == 'editor' || rights ==
'writer')}">
<a
href="../newsletter/NewsletterEditionRevoke.do?number=${result.id}&newsletterId=${requestScope.newsletterId}&forward=publicationedit"><img
src="<cmsc:staticurl page='/editors/gfx/icons/status_onlive.png'/>" width="16"
height="16" title="<fmt:message
key='site.newsletteredition.revokeapproval'/>"></a></c:if>
<a
href="../usermanagement/pagerights.jsp?number=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/rights.png'/>" width="16"
height="16" title="<fmt:message
key='newsletter.icons.title.userright'/>"></a></nobr>
</edit:ui-tcolumn>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
