From b090acacfafbdb3d480a00640131bddb4c9081ab Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 9 Jan 2014 14:53:56 -0800 Subject: [PATCH] CLOUDSTACK-5557: UI > Network > Guest Network > IP Address > fix a bug that SourceNAT IP, VPC tier IP wrongly showed Configuration tab(firewall/portforwarding/loadbalancing). SourceNAT IP, VPC tier IP should not show Configuration tab(firewall/portforwarding/loadbalancing). --- ui/scripts/network.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 9eaf0288cbf..d352320029d 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2222,12 +2222,14 @@ } } - if (ipAddress.vpcid && ipAddress.issourcenat) { + if (ipAddress.vpcid || ipAddress.issourcenat) { disableIpRules = true; } - if (disableVpn) disabledTabs.push('vpn'); - if (disableIpRules) disabledTabs.push('ipRules'); + if (disableVpn) + disabledTabs.push('vpn'); + if (disableIpRules) + disabledTabs.push('ipRules'); return disabledTabs; },