Repository: cloudstack Updated Branches: refs/heads/4.3-forward c1806bd87 -> d1440217e
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/d1440217 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d1440217 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d1440217 Branch: refs/heads/4.3-forward Commit: d1440217e9a44b6c12b588cbdca52daac6335d0c Parents: c1806bd Author: Jessica Wang <[email protected]> Authored: Fri Feb 21 14:01:52 2014 -0800 Committer: Jessica Wang <[email protected]> Committed: Fri Feb 21 14:01:52 2014 -0800 ---------------------------------------------------------------------- ui/scripts/configuration.js | 6 ++++++ ui/scripts/sharedFunctions.js | 3 +++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1440217/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 420cb7b..e52f519 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -522,6 +522,9 @@ memory: { label: 'label.memory.mb', converter: function(args) { + if (args == undefined) + return ''; + else return cloudStack.converters.convertBytes(args * 1024 * 1024); } }, @@ -1038,6 +1041,9 @@ memory: { label: 'label.memory.mb', converter: function(args) { + if (args == undefined) + return ''; + else return cloudStack.converters.convertBytes(args * 1024 * 1024); } }, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d1440217/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) {
