Skip to content

Commit 5ae65bf

Browse files
authored
ui: Fixed root volume resize from ui (#3873)
This PR fixes the volume resize action for a root volume from the UI. Fixes: #3860 #3874
1 parent 78cc0a4 commit 5ae65bf

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

ui/scripts/storage.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,13 +1575,13 @@
15751575
if (newDiskOffering != null && newDiskOffering.length > 0) {
15761576
array1.push("&diskofferingid=" + encodeURIComponent(newDiskOffering));
15771577
}
1578-
if (selectedDiskOfferingObj.iscustomized == true) {
1578+
if (args.context.volumes[0].type == "ROOT" || selectedDiskOfferingObj.iscustomized == true) {
15791579
cloudStack.addNewSizeToCommandUrlParameterArrayIfItIsNotNullAndHigherThanZero(array1, args.data.newsize);
15801580
}
15811581

15821582
var minIops;
15831583
var maxIops
1584-
if (selectedDiskOfferingObj.iscustomizediops == true) {
1584+
if (selectedDiskOfferingObj != null && selectedDiskOfferingObj.iscustomizediops == true) {
15851585
minIops = args.data.minIops;
15861586
maxIops = args.data.maxIops;
15871587
}
@@ -1593,13 +1593,12 @@
15931593
if (maxIops != null && maxIops.length > 0) {
15941594
array1.push("&maxiops=" + encodeURIComponent(maxIops));
15951595
}
1596-
//if original disk size > new disk size
1597-
if ((args.context.volumes[0].type == "ROOT")
1598-
&& (args.context.volumes[0].size > (newSize * (1024 * 1024 * 1024)))) {
1596+
//if original disk size > new disk size
1597+
if (args.context.volumes[0].type == "ROOT" &&
1598+
args.context.volumes[0].size > (args.data.newsize * (1024 * 1024 * 1024))) {
15991599
return args.response.error('message.volume.root.shrink.disk.size');
16001600
}
16011601

1602-
16031602
$.ajax({
16041603
url: createURL("resizeVolume&id=" + args.context.volumes[0].id + array1.join("")),
16051604
dataType: "json",

0 commit comments

Comments
 (0)