From 6c05b96ae0ea8199d33fd5e5f62bf862b8233097 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 24 Jan 2011 14:18:30 -0800 Subject: [PATCH] bug 7357: security group page - clean subgrid container when a security group is deleted and a tab is clicked. --- ui/scripts/cloud.core.securitygroup.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js index 438fd2f3832..0198d9f152f 100644 --- a/ui/scripts/cloud.core.securitygroup.js +++ b/ui/scripts/cloud.core.securitygroup.js @@ -437,12 +437,16 @@ function securityGroupToRightPanel($midmenuItem1) { function securityGroupJsonToDetailsTab() { var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1"); - if($midmenuItem1 == null) + if($midmenuItem1 == null) { + securityGroupClearDetailsTab(); return; + } var jsonObj = $midmenuItem1.data("jsonObj"); - if(jsonObj == null) + if(jsonObj == null) { + securityGroupClearDetailsTab(); return; + } var $thisTab = $("#right_panel_content #tab_content_details"); $thisTab.find("#tab_container").hide(); @@ -483,12 +487,16 @@ function securityGroupJsonToDetailsTab() { function securityGroupJsonToIngressRuleTab() { var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1"); - if($midmenuItem1 == null) + if($midmenuItem1 == null) { + securityGroupClearIngressRuleTab(); return; + } var securityGroupObj = $midmenuItem1.data("jsonObj"); - if(securityGroupObj == null) + if(securityGroupObj == null) { + securityGroupClearIngressRuleTab(); return; + } var $thisTab = $("#right_panel_content").find("#tab_content_ingressrule"); $thisTab.find("#tab_container").hide(); @@ -516,6 +524,11 @@ function securityGroupJsonToIngressRuleTab() { }); } +function securityGroupClearIngressRuleTab() { + var $thisTab = $("#right_panel_content").find("#tab_content_ingressrule"); + $thisTab.find("#tab_container").empty(); +} + function securityGroupIngressRuleJSONToTemplate(jsonObj, $template) { $template.data("jsonObj", jsonObj); $template.attr("id", "securitygroup_ingressRule_"+fromdb(jsonObj.id));