[jboss-svn-commits] JBL Code SVN: r18603 - in labs/jbosslabs/labs-3.0-build: views/admin/src/main/java/org/jboss/labs/admin/action/project and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 27 07:50:50 EST 2008
Author: wrzep
Date: 2008-02-27 07:50:50 -0500 (Wed, 27 Feb 2008)
New Revision: 18603
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/saveButtons.xhtml
Modified:
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java
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/overview.xhtml
Log:
JBLAB-930 members management
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java 2008-02-27 10:55:02 UTC (rev 18602)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/Project.java 2008-02-27 12:50:50 UTC (rev 18603)
@@ -255,6 +255,9 @@
}
public List<Username> getContributors() {
+ if (contributors == null) {
+ setContributors(new ArrayList<Username>());
+ }
return contributors;
}
@@ -325,4 +328,12 @@
public boolean deleteLink(Link link) {
return getLinkList().remove(link);
}
+
+ public void promoteToLead(Username username) {
+
+ if (getContributors().contains(username)) {
+ contributors.remove(username);
+ addProjectLead(username);
+ }
+ }
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java 2008-02-27 10:55:02 UTC (rev 18602)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java 2008-02-27 12:50:50 UTC (rev 18603)
@@ -39,8 +39,6 @@
@Name("showView")
public class ShowView {
- @In private Conversation conversation;
-
public String show(String description) {
String page = ((Character) description.charAt(0)).toString().toLowerCase()
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java 2008-02-27 10:55:02 UTC (rev 18602)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ViewProject.java 2008-02-27 12:50:50 UTC (rev 18603)
@@ -42,7 +42,7 @@
@Inject private ProjectService projectService;
- @Out(scope = ScopeType.CONVERSATION) private Project project;
+ @In(required = false) @Out(scope = ScopeType.CONVERSATION) private Project project;
@Logger private Log log;
@@ -57,4 +57,11 @@
return Pages.PROJECT_PAGE;
}
+
+ public String cancel() throws ProjectNotFoundException {
+
+ project = projectService.getProject(project.getProjectId());
+
+ return Pages.PROJECT_PAGE;
+ }
}
\ No newline at end of file
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-02-27 10:55:02 UTC (rev 18602)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/members.xhtml 2008-02-27 12:50:50 UTC (rev 18603)
@@ -15,22 +15,34 @@
<tr>
<th>Leads:</th>
<td>
- <ui:repeat var="lead" value="#{project.projectLeads}">
- #{lead.username}
- </ui:repeat>
+ <ul>
+ <ui:repeat var="lead" value="#{project.projectLeads}">
+ <li>#{lead.username}</li>
+ </ui:repeat>
+ </ul>
</td>
</tr>
<tr>
<th>Contributors:</th>
<td>
- <ui:repeat var="contributor" value="#{project.contributors}">
- #{contributor.username}
- </ui:repeat>
- <h:commandLink action="#{joinProject.join}" value="Join!"
- rendered="#{project.canJoin(user.name)}"/>
+ <ul>
+ <ui:repeat var="contributor" value="#{project.contributors}">
+ <li>
+ <h:outputText value="#{contributor.username} "/>
+ <h:commandLink value="Promote to lead"
+ action="#{project.promoteToLead(contributor)}"/>
+ </li>
+ </ui:repeat>
+ </ul>
</td>
</tr>
</table>
+ <h:outputText value="You are not a member of this project (TODO: move this to project page)."
+ rendered="#{project.canJoin(user.name)}"/>
+ <h:commandLink action="#{joinProject.join}" value="Join!"
+ rendered="#{project.canJoin(user.name)}"/>
+ <br/>
+ <ui:include src="saveButtons.xhtml"/>
</h:form>
</ui:define>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/overview.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/overview.xhtml 2008-02-27 10:55:02 UTC (rev 18602)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/overview.xhtml 2008-02-27 12:50:50 UTC (rev 18603)
@@ -78,9 +78,7 @@
</td>
</tr>
</table>
- <h:commandButton value="Save" action="#{saveProject.save('/project/project.seam')}"/>
- <h:commandButton value="Apply" action="#{saveProject.save('')}"/>
- <h:commandButton value="Cancel" action="/project/project.seam"/>
+ <ui:include src="saveButtons.xhtml"/>
</h:form>
</ui:define>
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/saveButtons.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/saveButtons.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/saveButtons.xhtml 2008-02-27 12:50:50 UTC (rev 18603)
@@ -0,0 +1,7 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+ <h:commandButton value="Save" action="#{saveProject.save('/project/project.seam')}"/>
+ <h:commandButton value="Apply" action="#{saveProject.save('')}"/>
+ <s:button value="Cancel" action="#{viewProject.cancel()}"/>
+</div>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list