[jboss-svn-commits] JBL Code SVN: r19680 - in labs/jbosslabs/labs-3.0-build: views/admin/src/main/java/org/jboss/labs/admin and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2008-04-22 04:18:49 -0400 (Tue, 22 Apr 2008)
New Revision: 19680

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/views/admin/src/main/java/org/jboss/labs/admin/ClearspaceManager.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/webapp/project/createProject.xhtml
   labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml
Log:
JBLAB-944, done

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-22 07:37:29 UTC (rev 19679)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java	2008-04-22 08:18:49 UTC (rev 19680)
@@ -41,6 +41,7 @@
     protected String name = "New Project";
     @Email protected String email;
     protected String jiraKey = "NEWPROJECT";
+    protected boolean wiki = true;
     protected boolean repository = true;
     protected boolean jira = true;
     protected boolean devForum = true;
@@ -155,6 +156,14 @@
         this.groups = groups;
     }
 
+    public boolean isWiki() {
+        return wiki;
+    }
+
+    public void setWiki(boolean wiki) {
+        this.wiki = wiki;
+    }
+
     @Transient
     public boolean isJoinRequest() {
         return true;

Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ClearspaceManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ClearspaceManager.java	2008-04-22 07:37:29 UTC (rev 19679)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ClearspaceManager.java	2008-04-22 08:18:49 UTC (rev 19680)
@@ -57,7 +57,7 @@
         String description = getProjectDescription(projectId, name);
 
         try {
-            Community  community = communityService.createCommunity(projectId, name, "description");
+            Community  community = communityService.createCommunity(name, name, "description");
 
             UserService userService = locator.getUserService();
             User user = userService.getUserByUsername("admin");

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-22 07:37:29 UTC (rev 19679)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java	2008-04-22 08:18:49 UTC (rev 19680)
@@ -88,7 +88,9 @@
 
         facesMessages.add("Project '" + projectRequest.getName() + "' created");      
 
-        clearspaceManager.createSpace(projectRequest.getProjectId(), projectRequest.getName());
+        if (projectRequest.isWiki()) {
+            clearspaceManager.createSpace(projectRequest.getProjectId(), projectRequest.getName());
+        }
 
         cleanRequest(projectRequest);
 

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-22 07:37:29 UTC (rev 19679)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml	2008-04-22 08:18:49 UTC (rev 19680)
@@ -34,6 +34,10 @@
                     <td><h:inputText value="#{req.jiraKey}" id="jiraKey" required="true" requiredMessage="JIRA key is required."/></td>
                 </tr>
                 <tr>
+                    <th>Wiki (project pages)?</th>
+                    <td><h:selectBooleanCheckbox value="#{req.wiki}"/></td>
+                </tr>
+                <tr>
                     <th>Code repository?</th>
                     <td><h:selectBooleanCheckbox value="#{req.repository}"/></td>
                 </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-04-22 07:37:29 UTC (rev 19679)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml	2008-04-22 08:18:49 UTC (rev 19680)
@@ -39,6 +39,10 @@
                     <td><h:inputText value="#{prjRequest.jiraKey}" id="jiraKey" required="true" requiredMessage="JIRA key is required."/></td>
                 </tr>
                 <tr>
+                    <th>Wiki (project pages)?</th>
+                    <td><h:selectBooleanCheckbox value="#{prjRequest.wiki}"/></td>
+                </tr>
+                <tr>
                     <th>Code repository?</th>
                     <td><h:selectBooleanCheckbox value="#{prjRequest.repository}"/></td>
                 </tr>