Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv898/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationTest.java
Log Message:
CMSC-743,Newsletter: possibility to send a test email
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-743
Index: NewsletterPublicationTest.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterPublicationTest.java 16 Apr 2008 03:55:07 -0000 1.2
+++ NewsletterPublicationTest.java 16 Apr 2008 05:23:43 -0000 1.3
@@ -14,13 +14,8 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import com.finalist.cmsc.navigation.NavigationUtil;
-import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
-import com.finalist.newsletter.publisher.NewsletterPublisher;
import com.finalist.newsletter.services.NewsletterPublicationService;
import com.finalist.newsletter.services.NewsletterServiceFactory;
@@ -39,19 +34,18 @@
if (isSendAction(request)) {
String email = getParameter(request, "email");
- String mineType = getParameter(request, "minetype");
- Node newsletterPublicationNode = cloud.getNode(number);
+ String mimeType = getParameter(request, "minetype");
- UserRole role =
NavigationUtil.getRole(newsletterPublicationNode.getCloud(),
newsletterPublicationNode, false);
- boolean isWebMaster = (role != null &&
SecurityUtil.isWebmaster(role));
-
- if (NavigationUtil.getChildCount(newsletterPublicationNode) > 0 &&
!isWebMaster) {
- return mapping.findForward("confirmationpage");
- }
+// UserRole role =
NavigationUtil.getRole(newsletterPublicationNode.getCloud(),
newsletterPublicationNode, false);
+// boolean isWebMaster = (role != null &&
SecurityUtil.isWebmaster(role));
+//
+// if (NavigationUtil.getChildCount(newsletterPublicationNode) > 0 &&
!isWebMaster) {
+// return mapping.findForward("confirmationpage");
+// }
// Thread publisher = new NewsletterPublisher(number);
// publisher.start();
NewsletterPublicationService publicationService =
NewsletterServiceFactory.getNewsletterPublicationService();
- publicationService.testDeliver(number,email,mineType);
+ publicationService.testDeliver(number,email,mimeType);
return mapping.findForward(SUCCESS);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
