Tal Nisan has uploaded a new change for review. Change subject: webadmin: Fixed a bug in disks allocation when importing a VM ......................................................................
webadmin: Fixed a bug in disks allocation when importing a VM When importing a VM without collapse snapshots the allocation should fit the original allocation and should not be changeable, when moving to collapse snapshots the allocation should be changeable and keep the same logic when switching from with or without collapse snapshot option Change-Id: Iff56b64302b4f0a07a4c6bbcfb0cccdf9533e292 Bug-Url: https://bugzilla.redhat.com/965170 Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportDiskData.java 1 file changed, 8 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/19234/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportDiskData.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportDiskData.java index c1d8234..523ddfb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportDiskData.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportDiskData.java @@ -8,16 +8,13 @@ import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; -import org.ovirt.engine.ui.uicompat.Event; -import org.ovirt.engine.ui.uicompat.EventArgs; -import org.ovirt.engine.ui.uicompat.IEventListener; public class ImportDiskData { ArrayList<StorageDomain> storageDomains; StorageDomain selectedStorageDomain; EntityModel collapseSnapshots; private ArrayList<StorageDomain> allStorageDomains; - VolumeType volumeType = VolumeType.Sparse; + VolumeType volumeType; VolumeType selectedVolumeType; Map<Guid, ArrayList<Quota>> storageQuotaList; Quota selectedQuota; @@ -46,10 +43,10 @@ } public VolumeType getSelectedVolumeType() { - if ((Boolean) collapseSnapshots.getEntity() && selectedVolumeType != null) { - return selectedVolumeType; + if (!(Boolean) collapseSnapshots.getEntity()) { + return getVolumeType(); } - return getVolumeType(); + return selectedVolumeType; } public void setSelectedVolumeType(VolumeType selectedVolumeType) { @@ -98,16 +95,14 @@ public void setVolumeType(VolumeType type) { volumeType = type; + setSelectedVolumeType(type); } public void setCollapseSnapshot(EntityModel collapseSnapshotsModel) { + if (!(Boolean) collapseSnapshotsModel.getEntity()) { + setSelectedVolumeType(getVolumeType()); + } this.collapseSnapshots = collapseSnapshotsModel; - collapseSnapshots.getEntityChangedEvent().addListener(new IEventListener() { - @Override - public void eventRaised(Event ev, Object sender, EventArgs args) { - setVolumeType(VolumeType.Sparse); - } - }); } public ArrayList<Quota> getQuotaList() { -- To view, visit http://gerrit.ovirt.org/19234 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff56b64302b4f0a07a4c6bbcfb0cccdf9533e292 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
