Repository: cloudstack Updated Branches: refs/heads/master 92064e347 -> c2fa24a24
CLOUDSTACK-6154: UI > compute offerings > memory field > check if value is undefined before converting it. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2fa24a2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2fa24a2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2fa24a2 Branch: refs/heads/master Commit: c2fa24a24ce9c21bd7d1f2811dfd42bd21007692 Parents: 92064e3 Author: Jessica Wang <[email protected]> Authored: Fri Feb 21 13:21:20 2014 -0800 Committer: Jessica Wang <[email protected]> Committed: Fri Feb 21 13:23:19 2014 -0800 ---------------------------------------------------------------------- ui/scripts/configuration.js | 10 ++++++++-- ui/scripts/sharedFunctions.js | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2fa24a2/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 6adbade..869b876 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -522,7 +522,10 @@ memory: { label: 'label.memory.mb', converter: function(args) { - return cloudStack.converters.convertBytes(args * 1024 * 1024); + if (args == undefined) + return ''; + else + return cloudStack.converters.convertBytes(args * 1024 * 1024); } }, networkrate: { @@ -1038,7 +1041,10 @@ memory: { label: 'label.memory.mb', converter: function(args) { - return cloudStack.converters.convertBytes(args * 1024 * 1024); + if (args == undefined) + return ''; + else + return cloudStack.converters.convertBytes(args * 1024 * 1024); } }, networkrate: { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2fa24a2/ui/scripts/sharedFunctions.js ---------------------------------------------------------------------- diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 2a15967..9fa70e3 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -900,6 +900,9 @@ var roleTypeDomainAdmin = "2"; cloudStack.converters = { convertBytes: function(bytes) { + if (bytes == undefined) + return ''; + if (bytes < 1024 * 1024) { return (bytes / 1024).toFixed(2) + " KB"; } else if (bytes < 1024 * 1024 * 1024) {
