Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv27164/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationPublish.java
Log Message:
Well, those are a lot of small fixes i made, but did not require a jira issue.
I still commit them now because China is going to continue this project.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Index: NewsletterPublicationPublish.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationPublish.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterPublicationPublish.java 17 Jan 2008 13:44:03 -0000 1.5
+++ NewsletterPublicationPublish.java 8 Mar 2008 15:57:55 -0000 1.6
@@ -34,14 +34,14 @@
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
int number = Integer.parseInt(getParameter(request, "number", true));
+ Node publicationNode = cloud.getNode(number);
if (isSendAction(request)) {
- Node newsletterPublicationNode = cloud.getNode(number);
- UserRole role =
NavigationUtil.getRole(newsletterPublicationNode.getCloud(),
newsletterPublicationNode, false);
+ UserRole role = NavigationUtil.getRole(publicationNode.getCloud(),
publicationNode, false);
boolean isWebMaster = (role != null &&
SecurityUtil.isWebmaster(role));
- if (NavigationUtil.getChildCount(newsletterPublicationNode) > 0 &&
!isWebMaster) {
+ if (NavigationUtil.getChildCount(publicationNode) > 0 &&
!isWebMaster) {
return mapping.findForward("confirmationpage");
}
Thread publisher = new NewsletterPublisher(number);
@@ -57,7 +57,12 @@
}
// neither remove or cancel, show confirmation page
- return mapping.findForward("confirmationpage");
+
+ String publishDate = publicationNode.getStringValue("publishdate");
+ if (publishDate != null && publishDate.length() > 0 ) {
+ return mapping.findForward("confirm_resend");
+ }
+ return mapping.findForward("confirm_send");
}
private boolean isCancelAction(HttpServletRequest request) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
