From 700402311d42eed3ea87afb263a036cd2b15f877 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 24 Jan 2011 15:50:44 -0800
Subject: [PATCH] bug 7357: service/disk offering page - clean subgrid
 container when a disk/service offering is deleted and a tab is clicked.

---
 ui/scripts/cloud.core.diskoffering.js    |  8 ++++++--
 ui/scripts/cloud.core.serviceoffering.js | 10 +++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js
index d0e42a8512c..18ddd801440 100644
--- a/ui/scripts/cloud.core.diskoffering.js
+++ b/ui/scripts/cloud.core.diskoffering.js
@@ -251,12 +251,16 @@ function diskOfferingToRightPanel($midmenuItem1) {
 
 function diskOfferingJsonToDetailsTab() { 
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    if($midmenuItem1 == null) {
+        diskOfferingClearDetailsTab();
         return;
+    }
     
     var jsonObj = $midmenuItem1.data("jsonObj");
-    if(jsonObj == null)
+    if(jsonObj == null) {
+        diskOfferingClearDetailsTab();
         return;
+    }
      
     var $thisTab = $("#right_panel_content #tab_content_details");  
     $thisTab.find("#tab_container").hide(); 
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index 2d85e3e0f8b..9cec2a11d78 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -249,12 +249,16 @@ function serviceOfferingToRightPanel($midmenuItem1) {
 
 function serviceOfferingJsonToDetailsTab() { 
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    if($midmenuItem1 == null) {
+        serviceOfferingClearDetailsTab();
         return;
+    }
     
     var jsonObj = $midmenuItem1.data("jsonObj");
-    if(jsonObj == null)
-        return;     
+    if(jsonObj == null) {
+        serviceOfferingClearDetailsTab();
+        return;   
+    }  
     
     var $thisTab = $("#right_panel_content #tab_content_details");  
     $thisTab.find("#tab_container").hide();