From b2bcb9e6e6d2d9b57687ab44dde00866beeffdf7 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 17 Nov 2010 18:18:58 -0800 Subject: [PATCH] bug 6940: IP Address page - Enable Static NAT option is only available for IP that is manageable. --- ui/scripts/cloud.core.ipaddress.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js index 0113e466363..fcef314b6e4 100644 --- a/ui/scripts/cloud.core.ipaddress.js +++ b/ui/scripts/cloud.core.ipaddress.js @@ -738,12 +738,11 @@ function ipJsonToDetailsTab() { if(ipObj.isstaticnat == true) { } - else { //ipObj.isstaticnat == false - buildActionLinkForTab("Enable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); - noAvailableActions = false; - + else { //ipObj.isstaticnat == false if(isIpManageable(ipObj.domainid, ipObj.account) == true && ipObj.issourcenat != true) { - buildActionLinkForTab("Release IP", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("Release IP", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("Enable Static NAT", ipActionMap, $actionMenu, $midmenuItem1, $thisTab); + noAvailableActions = false; } }