inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
7422: Deployment UI changes
   7424: Deployment UI changes
   7426: Created 'More Actions' menu for user sandboxes and moved various actions into it
   7428: Server config UI
   7433: Added ability to deploy a workflow sandbox to a test server
   7434: Fixed confusing comment
   7442: Enabled users with contributor and reviewer roles to reserve a test server and deploy to it
   7443: Preparation for auto deployment


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-02-22 14:50:39 +00:00
parent 1d96040edf
commit 37a6cb1486
22 changed files with 1125 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/bean/wcm/DeploymentUtil.java
View File

@@ -202,16 +202,16 @@ public final class DeploymentUtil
* for the given web project.
*
* @param webProject Web project to get test servers for
* @param allocated true only returns those servers already allocated
* @param availableOnly if true only returns those servers still available for deployment
* @return List of test servers
*/
public static List<NodeRef> findTestServers(NodeRef webProject, boolean allocated)
public static List<NodeRef> findTestServers(NodeRef webProject, boolean availableOnly)
{
return findServers(webProject, false, allocated);
return findServers(webProject, false, availableOnly);
}
private static List<NodeRef> findServers(NodeRef webProject, boolean live, boolean allocated)
private static List<NodeRef> findServers(NodeRef webProject, boolean live, boolean availableOnly)
{
FacesContext context = FacesContext.getCurrentInstance();
NodeService nodeService = Repository.getServiceRegistry(context).getNodeService();
@@ -242,7 +242,7 @@ public final class DeploymentUtil
query.append("\"");
// if required filter the test servers
if (live == false && allocated == false)
if (live == false && availableOnly)
{
query.append(" AND ISNULL:\"");
query.append(WCMAppModel.PROP_DEPLOYSERVERALLOCATEDTO.toString());