From efc11e8131de105dbe407e6ba1b036bdfa73b1cb Mon Sep 17 00:00:00 2001 From: davidjumani Date: Thu, 16 Jul 2020 10:43:35 +0530 Subject: [PATCH] compute: Fixing rootdisk size override in deploy vm form (#542) Addresses an issue from #520 Signed-off-by: Rohit Yadav --- ui/src/views/compute/DeployVM.vue | 5 +++-- ui/src/views/compute/wizard/DiskSizeSelection.vue | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue index f91cdc4cfd9..946ae67c891 100644 --- a/ui/src/views/compute/DeployVM.vue +++ b/ui/src/views/compute/DeployVM.vue @@ -960,7 +960,8 @@ export default { }) const templates = this.options.templates.filter(x => x.id === value) if (templates.length > 0) { - this.dataPreFill.minrootdisksize = templates[0].size / (1024 * 1024 * 1024) || 0 // bytes to GB + var size = templates[0].size / (1024 * 1024 * 1024) || 0 // bytes to GB + this.dataPreFill.minrootdisksize = Math.ceil(size) } } else if (name === 'isoid') { this.tabKey = 'isoid' @@ -1065,7 +1066,7 @@ export default { } else { deployVmData.templateid = values.isoid } - if (values.rootdisksize && values.rootdisksize > 0) { + if (this.showRootDiskSizeChanger && values.rootdisksize && values.rootdisksize > 0) { deployVmData.rootdisksize = values.rootdisksize } if (values.hypervisor && values.hypervisor.length > 0) { diff --git a/ui/src/views/compute/wizard/DiskSizeSelection.vue b/ui/src/views/compute/wizard/DiskSizeSelection.vue index b4f9a771e49..319cf6e84e9 100644 --- a/ui/src/views/compute/wizard/DiskSizeSelection.vue +++ b/ui/src/views/compute/wizard/DiskSizeSelection.vue @@ -53,8 +53,9 @@ export default { }, watch: { minDiskSize (newItem) { - if (this.inputValue < newItem) { + if (newItem && newItem > 0) { this.inputValue = newItem + this.updateDiskSize(newItem) } } },