[jboss-svn-commits] JBL Code SVN: r18757 - in labs/jbosslabs/labs-3.0-build/views/admin/src/main: webapp/layout and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 7 07:16:11 EST 2008
Author: wrzep
Date: 2008-03-07 07:16:10 -0500 (Fri, 07 Mar 2008)
New Revision: 18757
Modified:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml
Log:
JBLAB-933 (editing prj request) fixed + small validation fix
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java 2008-03-07 11:01:06 UTC (rev 18756)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ReviewProjectRequest.java 2008-03-07 12:16:10 UTC (rev 18757)
@@ -24,7 +24,9 @@
package org.jboss.labs.admin.action.project;
import org.jboss.labs.core.model.admin.ProjectRequest;
+import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.admin.Pages;
+import org.jboss.labs.injection.seam.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.core.Conversation;
import org.jboss.seam.annotations.In;
@@ -33,17 +35,25 @@
import org.jboss.seam.annotations.Begin;
import javax.persistence.EntityManager;
+import java.util.List;
+import com.google.inject.Inject;
+
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("reviewProjectRequest")
+ at Guice
public class ReviewProjectRequest {
@Out(required = false, scope= ScopeType.CONVERSATION) private long tId;
@Out(required = false, scope= ScopeType.CONVERSATION) private ProjectRequest prjRequest;
+ @Out(scope = ScopeType.CONVERSATION) private List<String> projectIds;
+
+ @Inject private ProjectService projectService;
+
@In private EntityManager entityManager;
@In private Conversation conversation;
@@ -53,6 +63,8 @@
this.tId = taskId;
prjRequest = entityManager.find(ProjectRequest.class, projectRequestId);
+ projectIds = projectService.getProjectIds();
+
conversation.setDescription("Request to create project '" + prjRequest.getName() + "'");
return Pages.TICKET_PAGE;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml 2008-03-07 11:01:06 UTC (rev 18756)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml 2008-03-07 12:16:10 UTC (rev 18757)
@@ -20,7 +20,7 @@
<div class="body">
<ui:include src="breadcrumbs.xhtml"/>
- <h:messages globalOnly="true" styleClass="message"/>
+ <h:messages styleClass="message"/>
<ui:insert name="body"/>
</div>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml 2008-03-07 11:01:06 UTC (rev 18756)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml 2008-03-07 12:16:10 UTC (rev 18757)
@@ -13,7 +13,6 @@
<f:facet name="header">Create Project Request</f:facet>
<h:form id="mainForm" >
- <h:messages styleClass="message"/>
<s:validateAll>
<table>
<tr>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-03-07 11:01:06 UTC (rev 18756)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-03-07 12:16:10 UTC (rev 18757)
@@ -12,51 +12,62 @@
<h2>Review project request</h2>
<h:form id="mainForm">
- <table>
+ <s:validateAll>
+ <table>
<tr>
- <th>Project Lead (email):</th>
- <td>#{prjRequest.email}</td>
+ <th>Email:</th>
+ <td>
+ <h:outputText value="#{prjRequest.email}" />
+ </td>
</tr>
<tr>
<th>Project Name:</th>
- <td>#{prjRequest.name}</td>
+ <td>
+ <h:inputText value="#{prjRequest.name}" id="projectName" required="true" requiredMessage="Project Name is required."/>
+ </td>
</tr>
<tr>
<th>Project ID:</th>
- <td>#{prjRequest.projectId}</td>
+ <td>
+ <h:inputText value="#{prjRequest.projectId}" id="projectId" required="true" requiredMessage="Project ID is required.">
+ <f:validator validatorId="uniqueProjectIdValidator"/>
+ </h:inputText>
+ </td>
</tr>
<tr>
<th>JIRA key:</th>
- <td>#{prjRequest.jiraKey}</td>
+ <td><h:inputText value="#{prjRequest.jiraKey}" id="jiraKey" required="true" requiredMessage="JIRA key is required."/></td>
</tr>
<tr>
<th>Code repository?</th>
- <td>#{prjRequest.repository ? 'yes' : 'no'}</td>
+ <td><h:selectBooleanCheckbox value="#{prjRequest.repository}"/></td>
</tr>
<tr>
<th>JIRA?</th>
- <td>#{prjRequest.jira ? 'yes' : 'no'}</td>
+ <td><h:selectBooleanCheckbox value="#{prjRequest.jira}"/></td>
</tr>
<tr>
<th>Forums and Mailing Lists?</th>
<td>
- dev #{prjRequest.devForum ? 'yes' : 'no'}<br/>
- user #{prjRequest.userForum ? 'yes' : 'no'}<br/>
- announce #{prjRequest.announceForum ? 'yes' : 'no'}
+ dev <h:selectBooleanCheckbox value="#{prjRequest.devForum}"/><br/>
+ user <h:selectBooleanCheckbox value="#{prjRequest.userForum}"/><br/>
+ announce <h:selectBooleanCheckbox value="#{prjRequest.announceForum}"/>
</td>
</tr>
</table>
+ </s:validateAll>
<h:commandLink value="Accept" action="#{acceptProject.accept(prjRequest)}" >
<f:param name="taskId" value="#{tId}" />
</h:commandLink>
<span/>
- <h:commandLink value="Reject" action="#{acceptProject.reject}" >
+ <s:link value="Reject" action="#{acceptProject.reject}">
+ <ui:remove><!-- s:link here to skip validation --></ui:remove>
<f:param name="taskId" value="#{tId}" />
- </h:commandLink>
+ </s:link>
<span/>
- <h:commandLink value="Cancel" action="/notifications.seam" >
+ <s:link value="Cancel" action="/notifications.seam">
<s:conversationPropagation type="end"/>
- </h:commandLink>
+ </s:link>
</h:form>
</ui:define>
More information about the jboss-svn-commits
mailing list