B #2533: Impossible to instantiate a VM w/ RESTRICTED_ATTR DISK/SIZE (#2534)

This commit is contained in:
Abel Coronado authored and Ruben S. Montero committed 2018-10-23 09:59:25 +02:00
1 parent a6513528df
commit 21fdee105a
1 file changed
+13 -6
+13 -6
View File
@@ -128,6 +128,7 @@ define(function(require){
"</div>").appendTo($(".disksContainer", disksContext));
if (disks_base) {
disks_base[disk_id].SIZE = disk.SIZE;
disks_base[disk_id].ORIGINAL_SIZE = disk.ORIGINAL_SIZE;
diskContext.data("template_disk", disks_base[disk_id]);
}
@@ -223,14 +224,20 @@ define(function(require){
$(".diskContainer", context).each(function(){
if ($(this).data("template_disk")) {
disk = $(this).data("template_disk");
var fields = WizardFields.retrieve(this);
var size = $.extend(true, [], fields.SIZE);
var size = size.join("");
var diskAux = $.extend(true, {}, disk);
diskAux["SIZE"] = fields.SIZE;
disks.push(diskAux);
if (disk["SIZE"] && fields["SIZE"] && disk["ORIGINAL_SIZE"] === fields["SIZE"] && fields["SIZE"] === disk["SIZE"]){
if (disk["IMAGE_ID"] || disk["IMAGE_NAME"]){
delete disk["SIZE"];
}
delete disk["ORIGINAL_SIZE"];
disks.push(disk);
} else {
var diskAux = $.extend(true, {}, disk);
diskAux["SIZE"] = fields["SIZE"];
delete diskAux["ORIGINAL_SIZE"];
disks.push(diskAux);
}
}
});