diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index 4a4ed638535..b7f6b222b4f 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -65,8 +65,7 @@ g_username = $.cookie("username"); g_account = $.cookie("account"); g_domainid = $.cookie("domainid"); - g_timezone = $.cookie("timezone"); - g_directAttachSecurityGroupsEnabled = $.cookie("directattachsecuritygroupsenabled"); + g_timezone = $.cookie("timezone"); g_userPublicTemplateEnabled = $.cookie("userpublictemplateenabled"); g_userfullname = $.cookie('userfullname'); g_userid = $.cookie('userid'); @@ -74,10 +73,7 @@ if($.cookie("timezoneoffset") != null) g_timezoneoffset = isNaN($.cookie("timezoneoffset"))?null: parseFloat($.cookie("timezoneoffset")); else - g_timezoneoffset = null; - - if (g_directAttachSecurityGroupsEnabled == null || g_directAttachSecurityGroupsEnabled.length == 0) - g_directAttachSecurityGroupsEnabled = "false"; + g_timezoneoffset = null; if (g_userPublicTemplateEnabled == null || g_userPublicTemplateEnabled.length == 0) g_userPublicTemplateEnabled = "true"; @@ -102,13 +98,7 @@ 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}); - } - - if (json.listcapabilitiesresponse.capability.securitygroupsenabled != null) { - g_directAttachSecurityGroupsEnabled = json.listcapabilitiesresponse.capability.securitygroupsenabled.toString(); //convert boolean to string if it's boolean - $.cookie('directattachsecuritygroupsenabled', g_directAttachSecurityGroupsEnabled, { expires: 1}); - } - + } userValid = true; }, error: function(xmlHTTP) { @@ -219,11 +209,6 @@ $.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1}); } - if (json.listcapabilitiesresponse.capability.securitygroupsenabled != null) { - g_directAttachSecurityGroupsEnabled = json.listcapabilitiesresponse.capability.securitygroupsenabled.toString(); //convert boolean to string if it's boolean - $.cookie('directattachsecuritygroupsenabled', g_directAttachSecurityGroupsEnabled, { expires: 1}); - } - g_userProjectsEnabled = json.listcapabilitiesresponse.capability.allowusercreateprojects; $.cookie('userProjectsEnabled', g_userProjectsEnabled, { expires: 1 }); diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index a99fb3c4e93..ef574c0d727 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -243,7 +243,7 @@ } }); - if(includingSecurityGroupService == false || selectedHypervisor == "VMware" || g_directAttachSecurityGroupsEnabled != "true") { + if(includingSecurityGroupService == false || selectedHypervisor == "VMware") { step5ContainerType = 'nothing-to-select'; } else { diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 03328deef82..97e35597d22 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_directAttachSecurityGroupsEnabled = "false"; var g_userPublicTemplateEnabled = "true"; //keyboard keycode