apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Jessica Wang 2012-01-25 16:45:47 -08:00
parent ace7d63a25
commit 079eb0f9eb
6 changed files with 20 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/old/scripts/cloud.core.init.js
View File

@ -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

38
ui/old/scripts/cloud.core.ipaddress.js
View File

@ -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("")),

1
ui/old/scripts/cloud.core.js
View File

@ -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";

13
ui/scripts/cloudStack.js
View File

@ -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});

6
ui/scripts/network.js
View File

@ -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'),

1
ui/scripts/sharedFunctions.js
View File

@ -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";