Daniel Erez has uploaded a new change for review. Change subject: webadmin: custom snapshot preview - default disks selection ......................................................................
webadmin: custom snapshot preview - default disks selection Custom snapshot dialog: if a partial snapshot has been pre-selected, the missing disks should be selected on the active snapshot by default. Change-Id: I78c1c11802c72c8eef91a25905078ce309dd03ea Bug-Url: https://bugzilla.redhat.com/1071791 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PreviewSnapshotModel.java 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/25539/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PreviewSnapshotModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PreviewSnapshotModel.java index b756cc3..b087355 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PreviewSnapshotModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PreviewSnapshotModel.java @@ -44,20 +44,34 @@ ArrayList<Snapshot> snapshots = response.getReturnValue(); previewSnapshotModel.sortSnapshots(snapshots); + Guid activeSnapshotId = null; + Guid userSelectedSnapshotId = previewSnapshotModel.getSnapshotModel().getEntity().getId(); + for (Snapshot snapshot : snapshots) { SnapshotModel snapshotModel = new SnapshotModel(); snapshotModel.setEntity(snapshot); snapshotModel.getMemory().setEntity(false); snapshotModel.setDisks((ArrayList<DiskImage>) snapshot.getDiskImages()); snapshotModels.add(snapshotModel); + + if (snapshot.getType() == Snapshot.SnapshotType.ACTIVE) { + activeSnapshotId = snapshot.getId(); + } } previewSnapshotModel.getSnapshots().setItems(snapshotModels); updateDiskSnapshotsMap(); - // Update disk-snapshots map and select snapshot + // Update disk-snapshots map updateDiskSnapshotsMap(); - previewSnapshotModel.selectSnapshot(previewSnapshotModel.getSnapshotModel().getEntity().getId()); + + // First selecting the active snapshot for ensuring default disks selection + // (i.e. when some disk are missing from the selected snapshot, + // the corresponding disks from the active snapshot should be selected). + previewSnapshotModel.selectSnapshot(activeSnapshotId); + + // Selecting the snapshot the was selected by the user + previewSnapshotModel.selectSnapshot(userSelectedSnapshotId); } }})); } -- To view, visit http://gerrit.ovirt.org/25539 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78c1c11802c72c8eef91a25905078ce309dd03ea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
