From 52cd5673cb21edc8eace9dc06eebe2314ffcc1e7 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Thu, 12 Jan 2012 16:45:56 +0100 Subject: [PATCH] oZones: do not open info tab when clicking on empty tables (cherry picked from commit 7010b29b8f3ce73c791d5a6965fca70f5aed0ce9) --- src/ozones/Server/public/js/plugins/vdcs-tab.js | 7 +++++-- src/ozones/Server/public/js/plugins/zones-tab.js | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ozones/Server/public/js/plugins/vdcs-tab.js b/src/ozones/Server/public/js/plugins/vdcs-tab.js index 88685d81f7..902744f212 100644 --- a/src/ozones/Server/public/js/plugins/vdcs-tab.js +++ b/src/ozones/Server/public/js/plugins/vdcs-tab.js @@ -234,11 +234,14 @@ function vdcElementArray(vdc_json){ } function vdcInfoListener() { - $("#tbodyvdcs tr").live("click", function(e){ + $("#tbodyvdcs tr").live("click", function(e){ if ($(e.target).is('input')) {return true;} - popDialogLoading(); + var aData = dataTable_vdcs.fnGetData(this); var id = $(aData[0]).val(); + if (!id) return true; + + popDialogLoading(); Sunstone.runAction("VDC.showinfo",id); return false; }); diff --git a/src/ozones/Server/public/js/plugins/zones-tab.js b/src/ozones/Server/public/js/plugins/zones-tab.js index c1c8e76213..d8ea22a55a 100644 --- a/src/ozones/Server/public/js/plugins/zones-tab.js +++ b/src/ozones/Server/public/js/plugins/zones-tab.js @@ -244,9 +244,12 @@ function zoneElementArray(zone_json){ function zoneInfoListener(){ $("#tbodyzones tr").live("click", function(e){ if ($(e.target).is('input')) {return true;} - popDialogLoading(); + var aData = dataTable_zones.fnGetData(this); var id = $(aData[0]).val(); + if (!id) return true; + + popDialogLoading(); Sunstone.runAction("Zone.showinfo",id); return false; });