diff --git a/ui/scripts/cloud.core.configuration.js b/ui/scripts/cloud.core.configuration.js index e431395c0d7..a7ee7aacee9 100644 --- a/ui/scripts/cloud.core.configuration.js +++ b/ui/scripts/cloud.core.configuration.js @@ -813,26 +813,22 @@ function showConfigurationTab() { var isTagged = target.data("vlan") != "untagged"; if (isDirect) { title = "Direct VLAN IP Range"; - } - var rightPanelHtmlForDirect = ""; - if (isDirect && isTagged) { - rightPanelHtmlForDirect = "

Domain ID: "+target.data("domainId")+"

Account: "+target.data("account")+"

" - } else if (isDirect && !isTagged) { - rightPanelHtmlForDirect = "

Pod: "+target.data("podname")+"

"; - } - + } rightPanel.html(title); - + var rightContentHtml = - "

VLAN ID: "+target.data("vlan")+"

" - + rightPanelHtmlForDirect + "

VLAN ID: "+target.data("vlan")+"

" + "

Gateway: "+target.data("gateway")+"

" + "

Netmask: "+target.data("netmask")+"

" + "

IP Range: "+target.data("name")+"

"; + if(target.data("domainId")!=null) + rightContentHtml += "

Domain ID: "+target.data("domainId")+"

"; if(target.data("domain")!=null) rightContentHtml += "

Domain: "+target.data("domain")+"

"; if(target.data("account")!=null) rightContentHtml += "

Account: "+target.data("account")+"

"; + if(target.data("podname")!=null) + rightContentHtml += "

Pod: "+target.data("podname")+"

"; 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();