From 079eb0f9ebe06a7a6d1ac3da6504180ea337011b Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 25 Jan 2012 16:45:47 -0800 Subject: [PATCH] firewallRuleUiEnabled has been removed from listcapabilitiesresponse API. Here is related UI change. In network page, we now use listnetworksresponse to determine whether or not to show firewall section. --- ui/old/scripts/cloud.core.init.js | 19 +++---------- ui/old/scripts/cloud.core.ipaddress.js | 38 ++++++++------------------ ui/old/scripts/cloud.core.js | 1 - ui/scripts/cloudStack.js | 13 ++------- ui/scripts/network.js | 6 ++-- ui/scripts/sharedFunctions.js | 1 - 6 files changed, 20 insertions(+), 58 deletions(-) diff --git a/ui/old/scripts/cloud.core.init.js b/ui/old/scripts/cloud.core.init.js index cbc0d3406d4..5f4cd52250b 100644 --- a/ui/old/scripts/cloud.core.init.js +++ b/ui/old/scripts/cloud.core.init.js @@ -597,8 +597,7 @@ $(document).ready(function() { g_timezoneoffset = null; g_timezone = null; g_supportELB = null; - g_firewallRuleUiEnabled = null; - + $.cookie('JSESSIONID', null); $.cookie('sessionKey', null); $.cookie('username', null); @@ -609,8 +608,7 @@ $(document).ready(function() { $.cookie('timezoneoffset', null); $.cookie('timezone', null); $.cookie('supportELB', null); - $.cookie('firewallRuleUiEnabled', null); - + $("body").stopTime(); // default is to redisplay the login page @@ -709,10 +707,7 @@ $(document).ready(function() { */ g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean $.cookie('supportELB', g_supportELB, { expires: 1}); - - g_firewallRuleUiEnabled = json.listcapabilitiesresponse.capability.firewallRuleUiEnabled.toString(); //convert boolean to string if it's boolean - $.cookie('firewallRuleUiEnabled', g_firewallRuleUiEnabled, { expires: 1}); - + if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) { g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean $.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1}); @@ -808,10 +803,7 @@ $(document).ready(function() { } if(g_supportELB == null) - g_supportELB = $.cookie("supportELB"); - - if(g_firewallRuleUiEnabled == null) - g_firewallRuleUiEnabled = $.cookie("firewallRuleUiEnabled"); + g_supportELB = $.cookie("supportELB"); $.ajax({ data: createURL("command=listCapabilities"), @@ -824,9 +816,6 @@ $(document).ready(function() { */ g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean $.cookie('supportELB', g_supportELB, { expires: 1}); - - g_firewallRuleUiEnabled = json.listcapabilitiesresponse.capability.firewallRuleUiEnabled.toString(); //convert boolean to string if it's boolean - $.cookie('firewallRuleUiEnabled', g_firewallRuleUiEnabled, { expires: 1}); if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) { g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean diff --git a/ui/old/scripts/cloud.core.ipaddress.js b/ui/old/scripts/cloud.core.ipaddress.js index 83f5ec4fc8c..df26e4fcdb7 100644 --- a/ui/old/scripts/cloud.core.ipaddress.js +++ b/ui/old/scripts/cloud.core.ipaddress.js @@ -213,10 +213,7 @@ function afterLoadIpJSP() { //****** Advanced Zone (begin) ******************************************************************************************************************* else { - if(g_firewallRuleUiEnabled == "true") - $("#tab_firewall").show(); - else - $("#tab_firewall").hide(); + $("#tab_firewall").show(); $("#tab_details,#tab_content_details").show(); @@ -469,10 +466,8 @@ function afterLoadIpJSP() { array1.push("&ipaddressid="+ipObj.id); array1.push("&startPort="+startPort); array1.push("&endPort="+endPort); - array1.push("&protocol="+protocol); - - if(g_firewallRuleUiEnabled == "true") - array1.push("&openfirewall=false"); + array1.push("&protocol="+protocol); + array1.push("&openfirewall=false"); $.ajax({ data: createURL("command=createIpForwardingRule"+array1.join("")), @@ -612,8 +607,7 @@ function afterLoadIpJSP() { var virtualMachineId = $createPortForwardingRow.find("#vm").val(); array1.push("&virtualmachineid=" + virtualMachineId); - if(g_firewallRuleUiEnabled == "true") - array1.push("&openfirewall=false"); + array1.push("&openfirewall=false"); $.ajax({ data: createURL("command=createPortForwardingRule"+array1.join("")), @@ -718,8 +712,7 @@ function afterLoadIpJSP() { var algorithm = createLoadBalancerRow.find("#algorithm_select").val(); array1.push("&algorithm="+algorithm); - if(g_firewallRuleUiEnabled == "true") - array1.push("&openfirewall=false"); + array1.push("&openfirewall=false"); $.ajax({ data: createURL("command=createLoadBalancerRule"+array1.join("")), @@ -846,25 +839,17 @@ function ipToRightPanel($midmenuItem1) { else $("#tab_details").click(); - if(ipObj.isstaticnat == true) { - if(g_firewallRuleUiEnabled == "true") { - $("#tab_firewall").show(); - $("#tab_port_range").hide(); - } - else { - $("#tab_firewall").hide(); - $("#tab_port_range").show(); - } + if(ipObj.isstaticnat == true) { + $("#tab_firewall").show(); + $("#tab_port_range").hide(); $("#tab_port_forwarding, #tab_load_balancer, #tab_vpn").hide(); } else { //ipObj.isstaticnat == false $("#tab_port_range").hide(); if(ipObj.forvirtualnetwork == true) { // Public network if(isIpManageable(ipObj.domainid, ipObj.account) == true) { // IP is managable - if(g_firewallRuleUiEnabled == "true") - $("#tab_firewall").show(); - else - $("#tab_firewall").hide(); + $("#tab_firewall").show(); + //Port Forwarding tab if(networkObj != null) { var firewallServiceObj = ipFindNetworkServiceByName("Firewall", networkObj); @@ -1178,8 +1163,7 @@ function showEnableVPNDialog($thisTab) { array1.push("&account="+ipObj.account); array1.push("&domainid="+ipObj.domainid); array1.push("&zoneid="+ipObj.zoneid); - if(g_firewallRuleUiEnabled == "true") - array1.push("&openfirewall=true"); + array1.push("&openfirewall=true"); $.ajax({ data: createURL("command=createRemoteAccessVpn"+array1.join("")), diff --git a/ui/old/scripts/cloud.core.js b/ui/old/scripts/cloud.core.js index bc2ad77ab15..39aa2f05905 100644 --- a/ui/old/scripts/cloud.core.js +++ b/ui/old/scripts/cloud.core.js @@ -1527,7 +1527,6 @@ var g_enableLogging = false; var g_timezoneoffset = null; var g_timezone = null; var g_supportELB = null; -var g_firewallRuleUiEnabled = null; //true or false // capabilities var g_directAttachSecurityGroupsEnabled = "false"; diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index b70320c8903..4ef6473bade 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -83,10 +83,7 @@ g_userPublicTemplateEnabled = "true"; if(g_supportELB == null) - g_supportELB = $.cookie("supportELB"); - - if(g_firewallRuleUiEnabled == null) - g_firewallRuleUiEnabled = $.cookie("firewallRuleUiEnabled"); + g_supportELB = $.cookie("supportELB"); var userValid = false; @@ -98,10 +95,7 @@ g_capabilities = json.listcapabilitiesresponse.capability; g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean $.cookie('supportELB', g_supportELB, { expires: 1}); - - g_firewallRuleUiEnabled = json.listcapabilitiesresponse.capability.firewallRuleUiEnabled.toString(); //convert boolean to string if it's boolean - $.cookie('firewallRuleUiEnabled', g_firewallRuleUiEnabled, { expires: 1}); - + g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects; $.cookie('userProjectsEnabled', g_userProjectsEnabled, { expires: 1 }); @@ -205,9 +199,6 @@ g_supportELB = json.listcapabilitiesresponse.capability.supportELB.toString(); //convert boolean to string if it's boolean $.cookie('supportELB', g_supportELB, { expires: 1}); - g_firewallRuleUiEnabled = json.listcapabilitiesresponse.capability.firewallRuleUiEnabled.toString(); //convert boolean to string if it's boolean - $.cookie('firewallRuleUiEnabled', g_firewallRuleUiEnabled, { expires: 1}); - if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) { g_userPublicTemplateEnabled = json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); //convert boolean to string if it's boolean $.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1}); diff --git a/ui/scripts/network.js b/ui/scripts/network.js index f5093addf74..568db03b213 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -662,7 +662,7 @@ add: { label: 'Add VMs', action: function(args) { - var openFirewall = g_firewallRuleUiEnabled == "true" ? false : true; + var openFirewall = false; var data = { algorithm: args.data.algorithm, name: args.data.name, @@ -1645,7 +1645,7 @@ add: { label: 'Add VMs', action: function(args) { - var openFirewall = g_firewallRuleUiEnabled == "true" ? false : true; + var openFirewall = false; var data = { algorithm: args.data.algorithm, name: args.data.name, @@ -1915,7 +1915,7 @@ add: { label: 'Add VM', action: function(args) { - var openFirewall = g_firewallRuleUiEnabled == "true" ? false : true; + var openFirewall = false; $.ajax({ url: createURL('createPortForwardingRule'), diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index f9e03256e65..14d13a20874 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -8,7 +8,6 @@ var g_enableLogging = false; var g_timezoneoffset = null; var g_timezone = null; var g_supportELB = null; -var g_firewallRuleUiEnabled = null; //true or false var g_directAttachSecurityGroupsEnabled = "false"; var g_userPublicTemplateEnabled = "true";