[jboss-svn-commits] JBL Code SVN: r19415 - in labs/jbosslabs/labs-3.0-build/views/admin/src/main: java/org/jboss/labs/admin/action/project and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Apr 4 09:11:42 EDT 2008
Author: wrzep
Date: 2008-04-04 09:11:42 -0400 (Fri, 04 Apr 2008)
New Revision: 19415
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestAccepted.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestRejected.xhtml
Modified:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Mailer.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml
Log:
JBLAB-939 - finished
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Mailer.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Mailer.java 2008-04-04 13:08:49 UTC (rev 19414)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Mailer.java 2008-04-04 13:11:42 UTC (rev 19415)
@@ -38,6 +38,16 @@
@In(create=true) private Renderer renderer;
@Logger private Log log;
+ public void send(String emailPage) {
+ try {
+ renderer.render(emailPage);
+ log.info("Email sent.");
+ }
+ catch (Exception e) {
+ log.warn(e);
+ }
+ }
+
public void sendJiraRequest() {
send(Pages.EMAIL_JIRA_REQUEST);
}
@@ -50,14 +60,11 @@
send(Pages.EMAIL_PROJECT_REJECTED);
}
+ public void sendJoinRequestRejected() {
+ send(Pages.EMAIL_JOIN_REJECTED);
+ }
- public void send(String emailPage) {
- try {
- renderer.render(emailPage);
- log.info("Email sent.");
- }
- catch (Exception e) {
- log.warn(e);
- }
+ public void sendJoinRequestAccepted() {
+ send(Pages.EMAIL_JOIN_ACCEPTED);
}
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-04-04 13:08:49 UTC (rev 19414)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-04-04 13:11:42 UTC (rev 19415)
@@ -60,4 +60,6 @@
public static final String EMAIL_JIRA_REQUEST = EMAIL_PREFIX + "/jiraRequest.xhtml";
public static final String EMAIL_PROJECT_ACCEPTED = EMAIL_PREFIX + "/projectRequestAccepted.xhtml";
public static final String EMAIL_PROJECT_REJECTED = EMAIL_PREFIX + "/projectRequestRejected.xhtml";
+ public static final String EMAIL_JOIN_ACCEPTED = EMAIL_PREFIX + "/joinRequestAccepted.xhtml";
+ public static final String EMAIL_JOIN_REJECTED = EMAIL_PREFIX + "/joinRequestRejected.xhtml";
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-04-04 13:08:49 UTC (rev 19414)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-04-04 13:11:42 UTC (rev 19415)
@@ -105,6 +105,12 @@
// @End
public String reject(Request projectRequest) {
+ if ((projectRequest.getAdminComment() == null)
+ || (projectRequest.getAdminComment().length() == 0)) {
+ facesMessages.add("Please provide a comment.");
+ return null;
+ }
+
cleanRequest(projectRequest);
businessProcess.resumeTask(tId);
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-04-04 13:08:49 UTC (rev 19414)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-04-04 13:11:42 UTC (rev 19415)
@@ -23,19 +23,20 @@
package org.jboss.labs.admin.action.user;
-import org.jboss.seam.annotations.Name;
+import com.google.inject.Inject;
+import org.jboss.labs.admin.Mailer;
+import org.jboss.labs.admin.Pages;
+import org.jboss.labs.core.model.admin.JoinRequest;
+import org.jboss.labs.core.service.ProjectService;
+import org.jboss.labs.exception.LabsRollbackException;
+import org.jboss.labs.injection.seam.Guice;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.bpm.BusinessProcess;
import org.jboss.seam.core.Conversation;
-import org.jboss.seam.bpm.BusinessProcess;
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.log.Log;
-import org.jboss.labs.admin.Pages;
-import org.jboss.labs.injection.seam.Guice;
-import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.core.model.admin.JoinRequest;
-import org.jboss.labs.exception.LabsRollbackException;
-import com.google.inject.Inject;
import javax.persistence.EntityManager;
@@ -54,6 +55,8 @@
@In private Conversation conversation;
@In private BusinessProcess businessProcess;
+ @In private Mailer mailer;
+
@In(create = true) private EntityManager entityManager;
@In private FacesMessages facesMessages;
@@ -81,6 +84,9 @@
businessProcess.resumeTask(tId);
businessProcess.startTask();
+
+ mailer.sendJoinRequestAccepted();
+
businessProcess.endTask("approve");
conversation.end();
@@ -101,10 +107,19 @@
// @End
public String reject(JoinRequest joinRequest) {
+ if ((joinRequest.getAdminComment() == null)
+ || (joinRequest.getAdminComment().length() == 0)) {
+ facesMessages.add("Please provide a comment.");
+ return null;
+ }
+
cleanRequest(joinRequest);
businessProcess.resumeTask(tId);
businessProcess.startTask();
+
+ mailer.sendJoinRequestRejected();
+
businessProcess.endTask("reject");
conversation.end();
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestAccepted.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestAccepted.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestAccepted.xhtml 2008-04-04 13:11:42 UTC (rev 19415)
@@ -0,0 +1,16 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from name="JBoss.org" address="#{emailFrom}" />
+ <m:replyTo>#{emailReplyTo}</m:replyTo>
+ <m:to name="#{user.name}">#{user.email}</m:to>
+ <m:subject>[jboss.org] Your request to join project #{jRequest.projectId} been accepted</m:subject>
+
+ <m:body>
+ <p>Your request to join project '#{jRequest.projectId}' been accepted.</p>
+ <p>Comment:<br/>#{jRequest.adminComment}</p>
+ jboss.org team
+ </m:body>
+
+</m:message>
\ No newline at end of file
Copied: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestRejected.xhtml (from rev 19412, labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestRejected.xhtml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestRejected.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestRejected.xhtml 2008-04-04 13:11:42 UTC (rev 19415)
@@ -0,0 +1,16 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from name="JBoss.org" address="#{emailFrom}" />
+ <m:replyTo>#{emailReplyTo}</m:replyTo>
+ <m:to name="#{user.name}">#{user.email}</m:to>
+ <m:subject>[jboss.org] Your request to join project #{jRequest.projectId} been rejected</m:subject>
+
+ <m:body>
+ <p>Your request to join project '#{jRequest.projectId}' been rejected.</p>
+ <p>Comment:<br/>#{jRequest.adminComment}</p>
+ jboss.org team
+ </m:body>
+
+</m:message>
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-04-04 13:08:49 UTC (rev 19414)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-04-04 13:11:42 UTC (rev 19415)
@@ -11,8 +11,10 @@
<ui:define name="body">
<h2>Review join project request</h2>
- User '#{jRequest.username}' wants to join project '#{jRequest.projectId}'.
+ <p>User '#{jRequest.username}' wants to join project '#{jRequest.projectId}'.</p>
<h:form id="mainForm">
+ Your comment:<br/>
+ <h:inputTextarea value="#{jRequest.adminComment}"/><br/>
<h:commandLink value="Accept" action="#{acceptJoin.accept(jRequest)}" >
<f:param name="taskId" value="#{tId}" />
</h:commandLink>
More information about the jboss-svn-commits
mailing list