[jboss-svn-commits] JBL Code SVN: r19682 - in labs/jbosslabs/labs-3.0-build: views/admin/src/main/java/org/jboss/labs/admin/action/user and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 22 06:33:16 EDT 2008
Author: wrzep
Date: 2008-04-22 06:33:16 -0400 (Tue, 22 Apr 2008)
New Revision: 19682
Modified:
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java
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
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml
Log:
JBLAB-904, join project - allow user to submit additional comment
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java 2008-04-22 08:41:32 UTC (rev 19681)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java 2008-04-22 10:33:16 UTC (rev 19682)
@@ -43,6 +43,11 @@
super(projectId, username);
}
+ public JoinRequest(String projectId, String username, String comment) {
+ this(projectId, username);
+ this.comment = comment;
+ }
+
@Transient
public boolean isJoinRequest() {
return true;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java 2008-04-22 08:41:32 UTC (rev 19681)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinProject.java 2008-04-22 10:33:16 UTC (rev 19682)
@@ -55,6 +55,8 @@
@Out(required = false) private List<ContributorAgreement> cas;
+ @In(required = false) private String comment;
+
@In private FacesMessages facesMessages;
@Out(required = false, scope= ScopeType.BUSINESS_PROCESS) private Integer joinRequestId;
@@ -84,7 +86,7 @@
facesMessages.add("Your request has been sent to the project lead.");
- JoinRequest jr = new JoinRequest(project.getProjectId(), user.getName());
+ JoinRequest jr = new JoinRequest(project.getProjectId(), user.getName(), comment);
created = new Date();
jr.setCreated(created);
Modified: 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 2008-04-22 08:41:32 UTC (rev 19681)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestAccepted.xhtml 2008-04-22 10:33:16 UTC (rev 19682)
@@ -8,7 +8,7 @@
<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>Your request to join project '#{jRequest.projectId}' has been accepted.</p>
<p>Comment:<br/>#{jRequest.adminComment}</p>
jboss.org team
</m:body>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestRejected.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestRejected.xhtml 2008-04-22 08:41:32 UTC (rev 19681)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/joinRequestRejected.xhtml 2008-04-22 10:33:16 UTC (rev 19682)
@@ -8,7 +8,7 @@
<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>Your request to join project '#{jRequest.projectId}' has been rejected.</p>
<p>Comment:<br/>#{jRequest.adminComment}</p>
jboss.org team
</m:body>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml 2008-04-22 08:41:32 UTC (rev 19681)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml 2008-04-22 10:33:16 UTC (rev 19682)
@@ -13,9 +13,11 @@
<h2>Join Project</h2>
<h:form id="mainForm" >
- Do you want to apply to join project '#{project.name}'?
- <h:commandButton value="Yes" action="#{joinProject.createRequest(project)}"/>
- <h:commandButton value="No" action="/project/projects.seam"/>
+ <p>Apply to join project '#{project.name}'</p>
+ Comment:<br/>
+ <h:inputTextarea value="#{comment}"/><br/>
+ <h:commandButton value="Submit" action="#{joinProject.createRequest(project)}"/>
+ <h:commandButton value="Cancel" action="/project/projects.seam"/>
</h:form>
</ui:define>
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-22 08:41:32 UTC (rev 19681)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-04-22 10:33:16 UTC (rev 19682)
@@ -13,6 +13,8 @@
<h2>Review join project request</h2>
<p>User '#{jRequest.username}' wants to join project '#{jRequest.projectId}'.</p>
<h:form id="mainForm">
+ User comment:<p>
+ <h:outputText value="#{empty jRequest.comment ? '--' : jRequest.comment}"/></p>
Your comment:<br/>
<h:inputTextarea value="#{jRequest.adminComment}"/><br/>
<h:commandLink value="Accept" action="#{acceptJoin.accept(jRequest)}" >
More information about the jboss-svn-commits
mailing list