[jboss-svn-commits] JBL Code SVN: r19720 - in labs/jbosslabs/labs-3.0-build: services/project-service/src/main/java/org/jboss/labs/core/service/impl and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Apr 25 10:06:20 EDT 2008
Author: wrzep
Date: 2008-04-25 10:06:20 -0400 (Fri, 25 Apr 2008)
New Revision: 19720
Modified:
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.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/licenses.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/members.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/projects.xhtml
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/requests.xhtml
Log:
JBLAB-904, UI changes requested by Cheyenne
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java 2008-04-25 14:06:20 UTC (rev 19720)
@@ -47,6 +47,7 @@
protected boolean devForum = true;
protected boolean userForum = true;
protected boolean announceForum = true;
+ protected String projectDescription;
@OneToOne
protected License license;
@@ -164,6 +165,14 @@
this.wiki = wiki;
}
+ public String getProjectDescription() {
+ return projectDescription;
+ }
+
+ public void setProjectDescription(String projectDescription) {
+ this.projectDescription = projectDescription;
+ }
+
@Transient
public boolean isJoinRequest() {
return true;
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-04-25 14:06:20 UTC (rev 19720)
@@ -45,6 +45,7 @@
Project p = new Project();
p.setProjectId(projectId);
p.setName(projectRequest.getName());
+ p.setDescription(projectRequest.getProjectDescription());
String lu = projectRequest.getUsername();
Username leadUsername = getUsername(lu, true);
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java 2008-04-25 14:06:20 UTC (rev 19720)
@@ -68,7 +68,7 @@
projectRequestId = req.getId();
- facesMessages.add("Your request has been sent to BMW. ");
+ facesMessages.add("Your request has been sent to the jboss.org administrators. ");
return Pages.CONFIRMATION_PAGE;
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml 2008-04-25 14:06:20 UTC (rev 19720)
@@ -36,8 +36,8 @@
</tr>
</table>
- Compatible licenses:
<h:dataTable value="#{l.compatibleLicensesList}" var="l" rendered="#{not empty l.compatibleLicensesList}">
+ <f:facet name="header"> Compatible licenses</f:facet>
<h:column>
<f:facet name="header">Name</f:facet>
#{l.name}
@@ -52,7 +52,7 @@
</h:column>
</h:dataTable>
<br/>
- <h:selectManyCheckbox value="#{compatibleLicenses}" layout="pageDirection">
+ <h:selectManyCheckbox value="#{compatibleLicenses}" layout="pageDirection" rendered="#{! empty licenseItems}">
<f:selectItems value="#{licenseItems}" />
</h:selectManyCheckbox>
<ui:remove>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml 2008-04-25 14:06:20 UTC (rev 19720)
@@ -32,6 +32,7 @@
<h:commandLink value="[delete]" action="#{deleteLicense.deleteLicense(l)}"/>
</h:column>
</h:dataTable>
+ <h:outputText value="No licenses" rendered="#{empty licenses}"/>
</h:form>
</ui:define>
</ui:composition>
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-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml 2008-04-25 14:06:20 UTC (rev 19720)
@@ -29,6 +29,10 @@
</h:inputText>
</td>
</tr>
+ <tr>
+ <th>Description:</th>
+ <td><h:inputTextarea value="#{req.projectDescription}"/></td>
+ </tr>
<tr>
<th>JIRA key:</th>
<td><h:inputText value="#{req.jiraKey}" id="jiraKey" required="true" requiredMessage="JIRA key is required."/></td>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/licenses.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/licenses.xhtml 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/licenses.xhtml 2008-04-25 14:06:20 UTC (rev 19720)
@@ -15,6 +15,7 @@
<h:selectManyCheckbox value="#{projectLicenses}" layout="pageDirection">
<f:selectItems value="#{projectLicenseItems}" />
</h:selectManyCheckbox>
+ <h:outputText value="(no licenses defined)" rendered="#{empty projectLicenseItems}"/>
<br/>
<h:commandButton value="Save" action="#{updateProjectLicenses.update()}" />
<h:commandButton value="Apply" action="#{updateProjectLicenses.apply()}" />
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/members.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/members.xhtml 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/members.xhtml 2008-04-25 14:06:20 UTC (rev 19720)
@@ -33,6 +33,9 @@
action="#{membersManager.confirmPromote(contributor)}"/>
</li>
</ui:repeat>
+ <s:fragment rendered="#{empty project.contributors}">
+ <li>(there are no contributors to this project)</li>
+ </s:fragment>
</ul>
</td>
</tr>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/projects.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/projects.xhtml 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/projects.xhtml 2008-04-25 14:06:20 UTC (rev 19720)
@@ -41,6 +41,7 @@
rendered="#{joinState.isLead(project, user.name)}"/>
</h:column>
</h:dataTable>
+ <h:outputText value="No projects defined" rendered="#{empty projectManager.projects}"/>
</h:form>
</ui:define>
</ui:composition>
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-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-04-25 14:06:20 UTC (rev 19720)
@@ -35,6 +35,10 @@
</td>
</tr>
<tr>
+ <th>Description:</th>
+ <td><h:inputTextarea value="#{prjRequest.projectDescription}"/></td>
+ </tr>
+ <tr>
<th>JIRA key:</th>
<td><h:inputText value="#{prjRequest.jiraKey}" id="jiraKey" required="true" requiredMessage="JIRA key is required."/></td>
</tr>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml 2008-04-25 13:54:21 UTC (rev 19719)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml 2008-04-25 14:06:20 UTC (rev 19720)
@@ -11,10 +11,10 @@
<ui:define name="body">
<h2>Requests</h2>
<h:form id="mainForm">
+ <h3>Incoming Requests</h3>
<h:dataTable value="#{pooledTaskInstanceList}"
rendered="#{! empty pooledTaskInstanceList}"
var="task">
- <f:facet name="header">Incoming Requests</f:facet>
<h:column>
<f:facet name="header">Id</f:facet>
#{task.id}
@@ -35,11 +35,12 @@
rendered="#{not empty (task.variables['joinRequestId'])}"/>
</h:column>
</h:dataTable>
+ <h:outputText value="No requests" rendered="#{empty pooledTaskInstanceList}"/>
+ <h3>My Pending Requests</h3>
<h:dataTable value="#{myRequests}"
rendered="#{! empty myRequests}"
var="r">
- <f:facet name="header">My Pending Requests</f:facet>
<h:column>
<f:facet name="header">Id</f:facet>
#{r.id}
@@ -55,6 +56,7 @@
#{r.description}
</h:column>
</h:dataTable>
+ <h:outputText value="No pending requests" rendered="#{empty myRequests}"/>
</h:form>
</ui:define>
</ui:composition>
More information about the jboss-svn-commits
mailing list