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

Browse Source 
- Merged DEV_TEMPORARY to 3.2
        17321 - ETHREEOH-962: User able to add some FSR or ASR with the same name

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-01-19 11:05:50 +00:00
parent 8e594817c3
commit d89c2164d0
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1140,6 +1140,7 @@ create_website_step7_title=Step Seven - Email Users
create_website_step7_desc=Notify the website users.
create_website_finish_instruction=To close this wizard and create your web project space click Finish. To review or change your selections click Back.
create_website_summary_users=Users and Roles
server_already_exist=Server with name {0} already exists.
edit_website_title=Edit Web Project Wizard
edit_website_desc=This wizard helps you modify the settings for a web project space.
edit_website_finish_instruction=To close this wizard and save the modified settings for your web project space click Finish. To review or change your selections click Back.

32
source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
View File

@@ -25,6 +25,7 @@
package org.alfresco.web.bean.wcm;
import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -87,6 +88,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
private static final long serialVersionUID = 6480869380508635173L;
private static final String MSG_USERROLES = "create_website_summary_users";
private static final String MSG_SERVER_ALREADY_EXIST = "server_already_exist";
private static final String COMPONENT_FORMLIST = "form-list";
private static final String COMPONENT_WORKFLOWLIST = "workflow-list";
@@ -1147,6 +1149,36 @@ public class CreateWebsiteWizard extends BaseWizardBean
public String saveDeploymentServerConfig()
{
String currentServerName = (String) editedDeployServerProps.get(DeploymentServerConfig.PROP_NAME);
if (currentServerName == null ||currentServerName.length() == 0)
{
currentServerName = "" + editedDeployServerProps.get(DeploymentServerConfig.PROP_HOST)+ ":" + editedDeployServerProps.get(DeploymentServerConfig.PROP_PORT);
}
for (DeploymentServerConfig server: deployServersList)
{
if (!server.getId().equals(currentDeployServer.getId()))
{
Map<String, Object> serverProps = server.getProperties();
String serverName = (String) serverProps.get(DeploymentServerConfig.PROP_NAME);
if (serverName == null ||serverName.length() == 0)
{
serverName = "" + serverProps.get(DeploymentServerConfig.PROP_HOST)+ ":" + serverProps.get(DeploymentServerConfig.PROP_PORT);
}
if (currentServerName.equals(serverName))
{
if (this.inAddDeployServerMode)
{
this.deployServersList.remove(this.currentDeployServer);
this.deployServersMap.remove(this.currentDeployServer.getId());
}
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), MSG_SERVER_ALREADY_EXIST), currentServerName));
return null;
}
}
}
// set the edited properties
this.currentDeployServer.setProperties(this.editedDeployServerProps);