Tomas Jelinek has uploaded a new change for review. Change subject: userportal,webadmin: all disks were by default bootable for instance images ......................................................................
userportal,webadmin: all disks were by default bootable for instance images The problem was that the new disk dialog opened from the new VM dialog was always "bootable: true". Fixed by 2 changes: - overridden the AbstractDiskModel.updateBootableDiskAvailable() in instance images models. The difference is that in the default implementation it takes the disks from server while in case of instance images from the dialg (not yet saved changes) - if created the disk image from the VM dialog (e.g. instance image) it is set "active" since it has to be considered to be active (e.g. no other disks has tbe bootable) Change-Id: Ifb699b2c1d8c2124b69d8032eefd8ba8e185844f Bug-Url: https://bugzilla.redhat.com/1213257 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java 2 files changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/40317/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java index 423b7f8..c1d9dfb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java @@ -465,7 +465,7 @@ } } - private void updateBootableDiskAvailable() { + protected void updateBootableDiskAvailable() { AsyncDataProvider.getInstance().getVmDiskList(new AsyncQuery(this, new INewAsyncCallback() { @Override public void onSuccess(Object target, Object returnValue) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java index 6e2a5a4..c597e1e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java @@ -121,6 +121,11 @@ parentModel.getParentListModel().setWindow(parentModel.getUnitVmModel()); } } + + @Override + protected void updateBootableDiskAvailable() { + updateBootableFrom(parentModel.getAllCurrentDisks()); + } }; model.setDisk(disk); @@ -172,6 +177,11 @@ fillData(); } + } + + @Override + protected void updateBootableDiskAvailable() { + updateBootableFrom(parentModel.getAllCurrentDisks()); } }; @@ -239,8 +249,17 @@ attachCommand.setIsAvailable(false); fillData(); + + if (getDisk().getDiskStorageType() == DiskStorageType.IMAGE) { + ((DiskImage) getDisk()).setActive(true); + } } } + + @Override + protected void updateBootableDiskAvailable() { + updateBootableFrom(parentModel.getAllCurrentDisks()); + } }; VM vm = new VM(); -- To view, visit https://gerrit.ovirt.org/40317 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb699b2c1d8c2124b69d8032eefd8ba8e185844f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
