apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Security Group page - fix a bug that newly created ingress rule failed to be deleted.

Browse Source
This commit is contained in:
Jessica Wang 2011-01-20 15:59:28 -08:00
parent e83f583122
commit 50c3e04697
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/scripts/cloud.core.securitygroup.js
View File

@ -218,11 +218,11 @@ function initAddIngressRuleDialog() {
$thisDialog.find("#spinning_wheel").show();
var securitygroupObj = $currentMidmenuItem.data("jsonObj");
var securityGroupId = securitygroupObj.id;
var domainId = securitygroupObj.domainid;
var account = securitygroupObj.account;
var securityGroupName = securitygroupObj.name;
var securityGroupObj = $currentMidmenuItem.data("jsonObj");
var securityGroupId = securityGroupObj.id;
var domainId = securityGroupObj.domainid;
var account = securityGroupObj.account;
var securityGroupName = securityGroupObj.name;
var moreCriteria = [];
moreCriteria.push("&domainid=" + domainId);
@ -294,7 +294,8 @@ function initAddIngressRuleDialog() {
var items = result.jobresult.securitygroup.ingressrule;
var $subgridItem = $("#ingressrule_tab_template").clone(true);
securityGroupIngressRuleJSONToTemplate(items[0], $subgridItem).data("parentSecurityGroupId", securityGroupId).data("parentSecurityGroupDomainId", domainId).data("parentSecurityGroupAccount", account).data("parentSecurityGroupName",securityGroupName);
//securityGroupIngressRuleJSONToTemplate(items[0], $subgridItem).data("parentSecurityGroupId", securityGroupId).data("parentSecurityGroupDomainId", domainId).data("parentSecurityGroupAccount", account).data("parentSecurityGroupName",securityGroupName);
securityGroupIngressRuleJSONToTemplate(items[0], $subgridItem).data("parentObj", securityGroupObj);
$subgridItem.find("#after_action_info").text("Ingress rule was added successfully.");
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
$("#right_panel_content").find("#tab_content_ingressrule").find("#tab_container").prepend($subgridItem.show());
@ -302,7 +303,8 @@ function initAddIngressRuleDialog() {
if(items.length > 1) {
for(var i=1; i<items.length; i++) {
var $subgridItem = $("#ingressrule_tab_template").clone(true);
securityGroupIngressRuleJSONToTemplate(items[i], $subgridItem).data("parentSecurityGroupId", securityGroupId).data("parentSecurityGroupDomainId", domainId).data("parentSecurityGroupAccount", account).data("parentSecurityGroupName",securityGroupName);
//securityGroupIngressRuleJSONToTemplate(items[i], $subgridItem).data("parentSecurityGroupId", securityGroupId).data("parentSecurityGroupDomainId", domainId).data("parentSecurityGroupAccount", account).data("parentSecurityGroupName",securityGroupName);
securityGroupIngressRuleJSONToTemplate(items[i], $subgridItem).data("parentObj", securityGroupObj);
$subgridItem.find("#after_action_info").text("Ingress rule was added successfully.");
$subgridItem.find("#after_action_info_container").removeClass("error").addClass("success").show();
$("#right_panel_content").find("#tab_content_ingressrule").find("#tab_container").prepend($subgridItem.show());