mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
CLOUDSTACK-6154: UI > compute offerings > memory field > check if value is undefined before converting it.
This commit is contained in:
parent
92064e347a
commit
c2fa24a24c
@ -522,7 +522,10 @@
|
|||||||
memory: {
|
memory: {
|
||||||
label: 'label.memory.mb',
|
label: 'label.memory.mb',
|
||||||
converter: function(args) {
|
converter: function(args) {
|
||||||
return cloudStack.converters.convertBytes(args * 1024 * 1024);
|
if (args == undefined)
|
||||||
|
return '';
|
||||||
|
else
|
||||||
|
return cloudStack.converters.convertBytes(args * 1024 * 1024);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
networkrate: {
|
networkrate: {
|
||||||
@ -1038,7 +1041,10 @@
|
|||||||
memory: {
|
memory: {
|
||||||
label: 'label.memory.mb',
|
label: 'label.memory.mb',
|
||||||
converter: function(args) {
|
converter: function(args) {
|
||||||
return cloudStack.converters.convertBytes(args * 1024 * 1024);
|
if (args == undefined)
|
||||||
|
return '';
|
||||||
|
else
|
||||||
|
return cloudStack.converters.convertBytes(args * 1024 * 1024);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
networkrate: {
|
networkrate: {
|
||||||
|
|||||||
@ -900,6 +900,9 @@ var roleTypeDomainAdmin = "2";
|
|||||||
|
|
||||||
cloudStack.converters = {
|
cloudStack.converters = {
|
||||||
convertBytes: function(bytes) {
|
convertBytes: function(bytes) {
|
||||||
|
if (bytes == undefined)
|
||||||
|
return '';
|
||||||
|
|
||||||
if (bytes < 1024 * 1024) {
|
if (bytes < 1024 * 1024) {
|
||||||
return (bytes / 1024).toFixed(2) + " KB";
|
return (bytes / 1024).toFixed(2) + " KB";
|
||||||
} else if (bytes < 1024 * 1024 * 1024) {
|
} else if (bytes < 1024 * 1024 * 1024) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user