apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug - Zones page - Direct VLAN IP Range - account field appears twice in view mode.

Browse Source
This commit is contained in:
Jessica Wang 2010-09-28 15:05:13 -07:00
parent e5186bde2b
commit f08ef8c6d4
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/cloud.core.configuration.js
View File

@ -814,25 +814,21 @@ function showConfigurationTab() {
if (isDirect) { if (isDirect) {
title = "<strong>Direct VLAN IP Range</strong>"; title = "<strong>Direct VLAN IP Range</strong>";
} }
var rightPanelHtmlForDirect = "";
if (isDirect && isTagged) {
rightPanelHtmlForDirect = "<p><span>Domain ID:</span> "+target.data("domainId")+"</p><p><span>Account:</span> "+target.data("account")+"</p>"
} else if (isDirect && !isTagged) {
rightPanelHtmlForDirect = "<p><span>Pod:</span> "+target.data("podname")+"</p>";
}
rightPanel.html(title); rightPanel.html(title);
var rightContentHtml = var rightContentHtml =
"<p><span>VLAN ID:</span> "+target.data("vlan")+"</p>" "<p><span>VLAN ID:</span> "+target.data("vlan")+"</p>"
+ rightPanelHtmlForDirect
+ "<p><span>Gateway:</span> "+target.data("gateway")+"</p>" + "<p><span>Gateway:</span> "+target.data("gateway")+"</p>"
+ "<p><span>Netmask:</span> "+target.data("netmask")+"</p>" + "<p><span>Netmask:</span> "+target.data("netmask")+"</p>"
+ "<p><span>IP Range:</span> "+target.data("name")+"</p>"; + "<p><span>IP Range:</span> "+target.data("name")+"</p>";
if(target.data("domainId")!=null)
rightContentHtml += "<p><span>Domain ID:</span> "+target.data("domainId")+"</p>";
if(target.data("domain")!=null) if(target.data("domain")!=null)
rightContentHtml += "<p><span>Domain:</span> "+target.data("domain")+"</p>"; rightContentHtml += "<p><span>Domain:</span> "+target.data("domain")+"</p>";
if(target.data("account")!=null) if(target.data("account")!=null)
rightContentHtml += "<p><span>Account:</span> "+target.data("account")+"</p>"; rightContentHtml += "<p><span>Account:</span> "+target.data("account")+"</p>";
if(target.data("podname")!=null)
rightContentHtml += "<p><span>Pod:</span> "+target.data("podname")+"</p>";
rightContent.data("id", target.data("id")).html(rightContentHtml); rightContent.data("id", target.data("id")).html(rightContentHtml);
$("#submenu_content_zones").find("#action_edit_zone, #action_add_pod, #action_edit_pod, #action_add_publicip_vlan, #action_add_directip_vlan").hide(); $("#submenu_content_zones").find("#action_edit_zone, #action_add_pod, #action_edit_pod, #action_add_publicip_vlan, #action_add_directip_vlan").hide();