From e6d064952de2504d63c6bae70f7b868fb8818a83 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 18 Apr 2012 13:30:16 -0700 Subject: [PATCH] cloudstack 3.0 UI - statistics tab in Instance page, Host page - Network Read, Network Write - if API returns 0, show 0 instead of N/A. --- ui/scripts/instances.js | 4 ++-- ui/scripts/system.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 9d9ac0e73c6..ac92ea4a953 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1695,8 +1695,8 @@ data: { totalCPU: jsonObj.cpunumber + " x " + cloudStack.converters.convertHz(jsonObj.cpuspeed), cpuused: jsonObj.cpuused, - networkkbsread: (jsonObj.networkkbsread == null || jsonObj.networkkbsread == 0)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbsread * 1024), - networkkbswrite: (jsonObj.networkkbswrite == null || jsonObj.networkkbswrite == 0)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbswrite * 1024) + networkkbsread: (jsonObj.networkkbsread == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbsread * 1024), + networkkbswrite: (jsonObj.networkkbswrite == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbswrite * 1024) } }); } diff --git a/ui/scripts/system.js b/ui/scripts/system.js index a3a22e07cba..87eaf5a6f06 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -6031,8 +6031,8 @@ memorytotal: (jsonObj.memorytotal == null || jsonObj.memorytotal == 0)? "N/A": cloudStack.converters.convertBytes(jsonObj.memorytotal), memoryallocated: (jsonObj.memoryallocated == null || jsonObj.memoryallocated == 0)? "N/A": cloudStack.converters.convertBytes(jsonObj.memoryallocated ), memoryused: (jsonObj.memoryused == null || jsonObj.memoryused == 0)? "N/A": cloudStack.converters.convertBytes(jsonObj.memoryused), - networkkbsread: (jsonObj.networkkbsread == null || jsonObj.networkkbsread == 0)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbsread * 1024), - networkkbswrite: (jsonObj.networkkbswrite == null || jsonObj.networkkbswrite == 0)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbswrite * 1024) + networkkbsread: (jsonObj.networkkbsread == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbsread * 1024), + networkkbswrite: (jsonObj.networkkbswrite == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbswrite * 1024) } }); }