From c4e2fe7b74fd7c7ff5e95e689c7caf35a82cbe32 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Tue, 31 Jul 2012 13:44:23 -0700 Subject: [PATCH] CS-15760 Don't show Configuration tab for VPC static NAT --- ui/scripts/network.js | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 9a7a56964ff..b02bb801118 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1253,15 +1253,27 @@ var disabledTabs = []; var ipAddress = args.context.ipAddresses[0]; - if (!ipAddress.vpnenabled) { - disabledTabs.push('vpn'); - } - if(ipAddress.issystem == true) { - disabledTabs.push('vpn'); + var disableVpn = false, disableIpRules = false; - if(ipAddress.isstaticnat == true || ipAddress.virtualmachineid != null) - disabledTabs.push('ipRules'); + if (!ipAddress.vpnenabled) { + disableVpn = true; } + + if (ipAddress.issystem == true) { + disableVpn = true; + + if (ipAddress.isstaticnat == true || ipAddress.virtualmachineid != null) { + disableIpRules = true; + } + } + + if (ipAddress.vpcid && ipAddress.issourcenat) { + disableIpRules = true; + } + + if (disableVpn) disabledTabs.push('vpn'); + if (disableIpRules) disabledTabs.push('ipRules'); + return disabledTabs; }, actions: {