From e3b35e8d95ef58e077f3ea3185fa74cd3dffdb9d Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 11 Aug 2011 16:26:47 -0700 Subject: [PATCH] bug 10843: cloudStack - Instance page - statistics tab - show "N/A" when NetworkRead/NetworkWrite is null or equal to zero. --- ui/scripts/cloud.core.instance.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index f65b24c9c6b..21f15552681 100755 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -2207,18 +2207,16 @@ function vmJsonToStatisticsTab() { $thisTab.find("#cpuspeed").text(convertHz(jsonObj.cpuspeed)); $thisTab.find("#percentused").text(jsonObj.cpuused); - - var networkKbsRead = ((jsonObj.networkkbsread==null)? "":convertBytes(jsonObj.networkkbsread * 1024)); - if(jsonObj.networkkbsread == 0) + + if(jsonObj.networkkbsread == null || jsonObj.networkkbsread == 0) $thisTab.find("#networkkbsread").text("N/A"); else - $thisTab.find("#networkkbsread").text(networkKbsRead); - - var networkKbsWrite = ((jsonObj.networkkbswrite==null)? "":convertBytes(jsonObj.networkkbswrite * 1024)); - if(jsonObj.networkkbswrite == 0) + $thisTab.find("#networkkbsread").text(convertBytes(jsonObj.networkkbsread * 1024)); + + if(jsonObj.networkkbswrite == null || jsonObj.networkkbswrite == 0) $thisTab.find("#networkkbswrite").text("N/A"); else - $thisTab.find("#networkkbswrite").text(networkKbsWrite); + $thisTab.find("#networkkbswrite").text(convertBytes(jsonObj.networkkbswrite * 1024)); } function vmJsonClearStatisticsTab() {