diff --git a/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java b/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java index 2a65ac5bbc..3a0f655bee 100644 --- a/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java @@ -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 params = new HashMap(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 testServers = DeploymentUtil.findAllocatedTestServers(this.store); + if (!testServers.isEmpty()) + { + return true; + } + return false; + } } diff --git a/source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java b/source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java index 95c5f71938..88ebf58b4f 100644 --- a/source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/ReleaseTestServerDialog.java @@ -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 diff --git a/source/web/jsp/wcm/manage-review-task-dialog.jsp b/source/web/jsp/wcm/manage-review-task-dialog.jsp index 249f65968d..3fd416df49 100644 --- a/source/web/jsp/wcm/manage-review-task-dialog.jsp +++ b/source/web/jsp/wcm/manage-review-task-dialog.jsp @@ -69,6 +69,8 @@ action="#{DialogManager.bean.deploy}" rendered="#{DialogManager.bean.testServersAvailable}" /> +