shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-08-25 21:49:29 +03:00
Code Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 21fdee105a)
This commit is contained in:
Abel Coronado
2018-10-23 09:59:25 +02:00
committed by Ruben S. Montero
parent cbf42a7492
commit 4125cd5b5c
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sunstone/public/app/utils/disks-resize.js
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,15 +224,21 @@ 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("");
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;
diskAux["SIZE"] = fields["SIZE"];
delete diskAux["ORIGINAL_SIZE"];
disks.push(diskAux);
}
}
});
return disks;