mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.2 to HEAD
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:
@@ -102,6 +102,7 @@ public class SubmitDialog extends BaseDialogBean
|
||||
private boolean enteringExpireDate = false;
|
||||
private boolean loadSelectedNodesFromBrowseBean = false;
|
||||
private boolean validateLinks = true;
|
||||
private boolean autoDeploy = false;
|
||||
private Date defaultExpireDate;
|
||||
private Date launchDate;
|
||||
|
||||
@@ -627,6 +628,8 @@ public class SubmitDialog extends BaseDialogBean
|
||||
this.workflowParams.put(WCMWorkflowModel.PROP_LAUNCH_DATE, this.launchDate);
|
||||
this.workflowParams.put(WCMWorkflowModel.PROP_VALIDATE_LINKS,
|
||||
new Boolean(this.validateLinks));
|
||||
this.workflowParams.put(WCMWorkflowModel.PROP_AUTO_DEPLOY,
|
||||
new Boolean(this.autoDeploy));
|
||||
this.workflowParams.put(WCMWorkflowModel.PROP_WEBAPP,
|
||||
this.avmBrowseBean.getWebapp());
|
||||
this.workflowParams.put(WCMWorkflowModel.ASSOC_WEBPROJECT,
|
||||
@@ -847,10 +850,27 @@ public class SubmitDialog extends BaseDialogBean
|
||||
{
|
||||
this.validateLinks = validateLinks;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Flag to indicate whether the changes should be deployed upon approval
|
||||
*/
|
||||
public boolean isAutoDeploy()
|
||||
{
|
||||
return this.autoDeploy;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param autoDeploy Flag to indicate whether the changes should be deployed upon approval
|
||||
*/
|
||||
public void setAutoDeploy(boolean autoDeploy)
|
||||
{
|
||||
this.autoDeploy = autoDeploy;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return List of UIListItem object representing the available workflows for the website
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public List<UIListItem> getWorkflowList()
|
||||
{
|
||||
if (this.workflowItems == null)
|
||||
|
Reference in New Issue
Block a user