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 V3.2 to HEAD:

Browse Source 
16713: ETHREEOH-2379 deployment missing crypto libraries.
    16722: ETHREEOH-2798 - java.lang.NullPointerException while deleting a folder node with emptyTranslation
    16752: ETHREEOH-2946 - Release a test server from inside an Approve/Reject task
    16796: ETHREEOH-1841 - MBean error when running in a WebSphere cluster
    16920: ETHREEOH-2796 - Word 97 To Text transformation fails
    16955: Merge V3.1 to V3.2
        14275: Invitation change for ETHREEOH-1456, Missed change from check in 14222.
        14222: ETHREEOH-1456 - accepting a rejected invitation.
    16963: ETHREEOH-3029 - Strange defaltOnLoadListsner in hibernate-context.xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-10-15 14:03:12 +00:00
parent edf3bf9d3f
commit d0ab977953
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java
View File

@@ -189,6 +189,18 @@ public class ManageReviewTaskDialog extends ManageTaskDialog
return "dialog:deployWebsite";
}
public String releaseTestServer()
{
if (logger.isDebugEnabled())
logger.debug("Release test server for store: " + store);
Map<String, String> params = new HashMap<String, String>(3);
params.put("store", this.store);
Application.getDialogManager().setupParameters(params);
return "dialog:releaseTestServer";
}
// ------------------------------------------------------------------------------
// Getters and Setters
@@ -273,4 +285,22 @@ public class ManageReviewTaskDialog extends ManageTaskDialog
return (propVal != null);
}
/**
*
*/
/**
* @return Determines whether a test server is allocated
*/
public boolean getTestServerAllocated()
{
// if a test server has already been allocated inform the dialog
// that an update is needed
List<NodeRef> testServers = DeploymentUtil.findAllocatedTestServers(this.store);
if (!testServers.isEmpty())
{
return true;
}
return false;
}
}

5
source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java
View File

@@ -82,8 +82,9 @@ public class ReleaseTestServerDialog extends BaseDialogBean
}
// close dialog and refresh website view
return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browseWebsite";
// return AlfrescoNavigationHandler.CLOSE_DIALOG_OUTCOME +
// AlfrescoNavigationHandler.OUTCOME_SEPARATOR + "browseWebsite";
return(outcome);
}
@Override

2
source/web/jsp/wcm/manage-review-task-dialog.jsp
View File

@@ -69,6 +69,8 @@
action="#{DialogManager.bean.deploy}" rendered="#{DialogManager.bean.testServersAvailable}" />
<a:actionLink id="resources-action2" value="#{msg.deployment_report_action}" image="/images/icons/deployment_report.gif"
action="#{DialogManager.bean.viewDeployReport}" rendered="#{DialogManager.bean.deployAttempted}" />
<a:actionLink id="resources-action3" value="#{msg.sandbox_release_test_server}" image="/images/icons/release_server.gif"
action="#{DialogManager.bean.releaseTestServer}" rendered="#{DialogManager.bean.testServerAllocated}" />
</h:panelGroup>
</f:facet>
</h:panelGroup>