From 4e6071ee98d367c90adf347b91fb783cb027b13e Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Thu, 12 Jan 2012 16:39:28 +0100 Subject: [PATCH] SelfSerice: Do not open info panels on empty list click. (cherry picked from commit 60b8e15ee9a28eabcdfaf00d4cb23d34e4a7a339) --- src/cloud/occi/lib/ui/public/js/plugins/compute.js | 5 ++++- src/cloud/occi/lib/ui/public/js/plugins/network.js | 7 +++++-- src/cloud/occi/lib/ui/public/js/plugins/storage.js | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/cloud/occi/lib/ui/public/js/plugins/compute.js b/src/cloud/occi/lib/ui/public/js/plugins/compute.js index b321b8cbe7..fb64497c31 100644 --- a/src/cloud/occi/lib/ui/public/js/plugins/compute.js +++ b/src/cloud/occi/lib/ui/public/js/plugins/compute.js @@ -427,9 +427,12 @@ function vMachineInfoListener(){ $('#tbodyvmachines tr',dataTable_vMachines).live("click", function(e){ if ($(e.target).is('input') || $(e.target).is('a img')) {return true;} - popDialogLoading(); + var aData = dataTable_vMachines.fnGetData(this); var id = $(aData[0]).val(); + if (!id) return true; + + popDialogLoading(); Sunstone.runAction("VM.showinfo",id); return false; }); diff --git a/src/cloud/occi/lib/ui/public/js/plugins/network.js b/src/cloud/occi/lib/ui/public/js/plugins/network.js index 52c82ae58a..436b040939 100644 --- a/src/cloud/occi/lib/ui/public/js/plugins/network.js +++ b/src/cloud/occi/lib/ui/public/js/plugins/network.js @@ -237,10 +237,13 @@ function vNetworkElementArray(vn_json){ function vNetworkInfoListener(){ $('#tbodyvnetworks tr',dataTable_vNetworks).live("click", function(e){ - if ($(e.target).is('input')) {return true;} - popDialogLoading(); + if ($(e.target).is('input')) {return true;}; + var aData = dataTable_vNetworks.fnGetData(this); var id = $(aData[0]).val(); + if (!id) return true; + + popDialogLoading(); Sunstone.runAction("Network.showinfo",id); return false; }); diff --git a/src/cloud/occi/lib/ui/public/js/plugins/storage.js b/src/cloud/occi/lib/ui/public/js/plugins/storage.js index 06d719a44f..d6fbfe10d9 100644 --- a/src/cloud/occi/lib/ui/public/js/plugins/storage.js +++ b/src/cloud/occi/lib/ui/public/js/plugins/storage.js @@ -308,9 +308,11 @@ function imageInfoListener(){ if (target.is('input') || target.is('select') || target.is('option')) return true; - popDialogLoading(); var aData = dataTable_images.fnGetData(this); var id = $(aData[0]).val(); + if (!id) return true; + + popDialogLoading(); Sunstone.runAction("Image.showinfo",id); return false; });