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

Merge WCM_WDR_MER TO HEAD

Browse Source 
MOB-399 Implementation of Deploymemnt Engine
     MOB-669
     MOB-630
     Revisions 14181 - 14539 merged,,

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2009-06-04 20:57:18 +00:00
parent 314aca790f
commit 3914f58767
3 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/alfresco/messages/webclient.properties
View File

@@ -1102,9 +1102,9 @@ form_template_templates=Configure Templates
form_template_templates_desc=Setup the Templates you want to use for the Web Form {0} in Web Project {1}.
form_template_workflow=Configure Workflow
form_template_workflow_desc=Configure the workflow defaults for this Web Project
create_website_step3_title=Step Three - Configure Deployment Servers
create_website_step3_desc=Configure deployment servers for the web project.
website_deployment=Configure Deployment Servers
create_website_step3_title=Step Three - Configure Deployment Receivers
create_website_step3_desc=Configure deployment receivers for the web project.
website_deployment=Configure Deployment Receivers
create_website_step4_title=Step Four - Configure Web Content Forms
create_website_step4_desc=Select and configure web forms for generating site content.
website_select_form=Select Web Forms
@@ -1335,8 +1335,8 @@ deploy_status_in_progress=IN PROGRESS
deploy_status_live=LIVE
deploy_status_failed=FAILED
deploy_status_partial=PARTIAL FAILURE
deploy_add_alf_receiver=Add Alfresco Server Receiver (ASR)
deploy_add_file_receiver=Add File System Receiver (FSR)
deploy_add_alf_receiver=Add ASR (Deprecated)
deploy_add_file_receiver=Add Deployment Receiver
deploy_server_type_live=Live Server
deploy_server_type_test=Test Server
deploy_server=Server
@@ -1367,9 +1367,9 @@ edit_deploy_server=Edit Deployment Server Details
delete_deploy_server=Delete Deployment Server
no_deploy_servers=No deployment servers have been configured.
add_alf_deploy_server_info=Provide details of the Alfresco Server Receiver to add
add_file_deploy_server_info=Provide details of the File System Receiver to add
add_file_deploy_server_info=Provide details of the Deployment Receiver to add
edit_alf_deploy_server_info=Edit details of the Alfresco Server Receiver
edit_file_deploy_server_info=Edit details of the File System Receiver
edit_file_deploy_server_info=Edit details of the Deployment Receiver
reason=Reason
snapshot=Snapshot
current_working_version=current working version

13
source/java/org/alfresco/web/ui/wcm/component/UIDeploymentServers.java
View File

@@ -732,11 +732,13 @@ public class UIDeploymentServers extends UIInput
UIComponent host = context.getApplication().createComponent(
UIInput.COMPONENT_TYPE);
FacesHelper.setupComponentId(context, host, "deployServerHost");
host.getAttributes().put("styleClass", "inputField");
host.getAttributes().put("onkeyup",
"javascript:Alfresco.checkDeployConfigButtonState();");
host.getAttributes().put("onchange",
"javascript:Alfresco.checkDeployConfigButtonState();");
ValueBinding vbHost = context.getApplication().createValueBinding(
"#{WizardManager.bean.editedDeployServerProperties." +
DeploymentServerConfig.PROP_HOST + "}");
@@ -757,13 +759,22 @@ public class UIDeploymentServers extends UIInput
UIInput.COMPONENT_TYPE);
FacesHelper.setupComponentId(context, port, "deployServerPort");
port.getAttributes().put("styleClass", "inputField");
port.getAttributes().put("onkeyup",
"javascript:Alfresco.checkDeployConfigButtonState();");
port.getAttributes().put("onchange",
"javascript:Alfresco.checkDeployConfigButtonState();");
ValueBinding vbPort = context.getApplication().createValueBinding(
"#{WizardManager.bean.editedDeployServerProperties." +
DeploymentServerConfig.PROP_PORT + "}");
port.setValueBinding("value", vbPort);
this.getChildren().add(port);
Utils.encodeRecursive(context, port);
out.write("</td></tr>");
out.write("</td><td><img src='");
out.write(contextPath);
out.write("/images/icons/required_field.gif' title='");
out.write(bundle.getString("required_field"));
out.write("'/></td></tr>");
// create the server url field
out.write("<tr><td align='right'>");

16
source/web/scripts/ajax/deployment.js
View File

@@ -117,18 +117,24 @@ Alfresco.checkDeployConfigPage = function()
Alfresco.checkDeployConfigButtonState = function()
{
var host = document.getElementById('wizard:wizard-body:deployServerHost');
var port = document.getElementById('wizard:wizard-body:deployServerPort');
var button = document.getElementById('wizard:wizard-body:deployActionButton');
console.log(button);
if (button != null)
{
var buttonState = false;
if (port != null && port.value.length == 0)
{
buttonState = true;
}
if (host != null && host.value.length == 0)
{
button.disabled = true;
}
else
{
button.disabled = false;
buttonState = true;
}
button.disabled = buttonState;
}
}