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

Browse Source 
17701: Fix for ETHREEOH-3691 - Blocker issue deleting a group
   17703: ETHREEOH-3688 - Impossibility to open Edit Metadata page for folders from Details page
   17705: ETHREEOH-3707 - Script error occurs when trying to invite external user to site
   17706: ETHREEOH-3678 - Blocker issue: the column 'Path' is empty for 'Move to' and 'Copy to' actions at 'View Detail' page
   17724: Merged DEV/TEMPORARY to V3.2
      17720: ETHREEOH-3703: Bootstrapped content refers to ALC
   17733: Fixes for ETHREEOH-3726, ETHREEOH-3660 and ETHREEOH-3629.
   17960: *RECORD ONLY* Fix for unclosed InputStream in PresentationContainer (already fixed in SpringSurf/3.3).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-01-20 10:57:18 +00:00
parent 984ee0a2aa
commit f387d887f0
1 changed files with 127 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/web/ui/wcm/component/UIDeployWebsite.java
View File

@@ -264,8 +264,6 @@ public class UIDeployWebsite extends UIInput
if (servers.size() > 0) if (servers.size() > 0)
{ {
ParentChildCheckboxHelper helper = new ParentChildCheckboxHelper(this.getClientId(context)); ParentChildCheckboxHelper helper = new ParentChildCheckboxHelper(this.getClientId(context));
//boolean first = true;
//String currentDisplayGroup = "";
boolean selected = false; boolean selected = false;
for (DeploymentServerConfig server: servers) for (DeploymentServerConfig server: servers)
@@ -280,14 +278,14 @@ public class UIDeployWebsite extends UIInput
out.write("<input type='checkbox' id='"); out.write("<input type='checkbox' id='");
out.write(helper.groupParentId); out.write(helper.groupParentId);
out.write("' value='"); out.write("' value='");
out.write(displayGroup); out.write(Utils.encode(displayGroup));
out.write("'"); out.write("'");
out.write(" "); out.write(" ");
out.write("onClick=\"select_all(\'"); out.write("onClick=\"select_all(\'");
out.write(helper.groupChildName); out.write(helper.groupChildName);
out.write("\', this.checked);\" "); out.write("\', this.checked);\" ");
out.write(" /> "); out.write(" /> ");
out.write(displayGroup); out.write(Utils.encode(displayGroup));
out.write("</p>"); out.write("</p>");
} }
@@ -348,7 +346,7 @@ public class UIDeployWebsite extends UIInput
out.write("<input type='checkbox' id='"); out.write("<input type='checkbox' id='");
out.write(helper.groupParentId); out.write(helper.groupParentId);
out.write("' value='"); out.write("' value='");
out.write(displayGroup); out.write(Utils.encode(displayGroup));
out.write("'"); out.write("'");
out.write(" checked='checked' "); out.write(" checked='checked' ");
@@ -357,7 +355,7 @@ public class UIDeployWebsite extends UIInput
out.write("\', this.checked);\" "); out.write("\', this.checked);\" ");
out.write(" /> "); out.write(" /> ");
out.write(displayGroup); out.write(Utils.encode(displayGroup));
out.write("</p>"); out.write("</p>");
} }
@@ -619,15 +617,6 @@ public class UIDeployWebsite extends UIInput
renderPanelMiddle(out, contextPath, nodeService, server, true); renderPanelMiddle(out, contextPath, nodeService, server, true);
// if (selected == false)
// {
// out.write("<div class='deployPanelServerStatus'><img src='");
// out.write(contextPath);
// out.write("/images/icons/info_icon.gif' style='vertical-align: -5px;' />&nbsp;");
// out.write(Application.getMessage(context, "deploy_server_not_selected"));
// out.write("</div>");
// }
renderPanelEnd(out, contextPath); renderPanelEnd(out, contextPath);
} }
@@ -807,7 +796,6 @@ private List<DeploymentServerConfig> toSortedDeploymentServerConfig(NodeService
private void changeGroup(String newGroupName) private void changeGroup(String newGroupName)
{ {
// Examples of HTML naming scheme // Examples of HTML naming scheme
// jsp17:group1:parent, jsp17:group1:child // jsp17:group1:parent, jsp17:group1:child
// jsp17:group2:parent, jsp17:group2:child // jsp17:group2:parent, jsp17:group2:child