Sergey Gotliv has uploaded a new change for review. Change subject: webadmin: Fix storage domain details in Edit VM Disk window ......................................................................
webadmin: Fix storage domain details in Edit VM Disk window This window displayed storage domain based on volume type instead of the storage domain of that disk. Change-Id: I78c4cf073063b0f5cdd8d76423bd5ce18cd9e27e Signed-off-by: Sergey Gotliv <[email protected]> --- 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/EditDiskModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java 3 files changed, 22 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/24559/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 781df7c..c8a3294 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 @@ -329,6 +329,8 @@ protected abstract void setDefaultInterface(); + protected abstract void updateVolumeType(StorageType storageType); + protected boolean isEditEnabled() { return getIsFloating() || getIsNew() || getVm().isDown() || !getDisk().getPlugged(); } @@ -361,7 +363,7 @@ updateDatacenters(); } - private void updateStorageDomains(final StoragePool datacenter) { + protected void updateStorageDomains(final StoragePool datacenter) { AsyncDataProvider.getPermittedStorageDomainsByStoragePoolId(new AsyncQuery(this, new INewAsyncCallback() { @Override public void onSuccess(Object target, Object returnValue) { @@ -527,11 +529,6 @@ setVolumeFormat(AsyncDataProvider.getDiskVolumeFormat(volumeType, storageType)); } - private void setDefaultVolumeType(StorageType storageType) { - getVolumeType().setSelectedItem(storageType.isBlockDomain() ? VolumeType.Preallocated : VolumeType.Sparse); - volumeType_SelectedItemChanged(); - } - public void updateInterface(final Version clusterVersion) { if (getVm() != null) { AsyncDataProvider.isVirtioScsiEnabledForVm(new AsyncQuery(this, new INewAsyncCallback() { @@ -641,7 +638,7 @@ updateDatacenters(); } - private void volumeType_SelectedItemChanged() { + protected void volumeType_SelectedItemChanged() { if (getVolumeType().getSelectedItem() == null || getDataCenter().getSelectedItem() == null || getStorageDomain().getSelectedItem() == null) { return; @@ -738,8 +735,8 @@ private void storageDomain_SelectedItemChanged() { StorageDomain selectedStorage = (StorageDomain) getStorageDomain().getSelectedItem(); - if (selectedStorage != null && getIsNew()) { - setDefaultVolumeType(selectedStorage.getStorageType()); + if (selectedStorage != null) { + updateVolumeType(selectedStorage.getStorageType()); } updateQuota((StoragePool) getDataCenter().getSelectedItem()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java index b08ce86..f468016 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/EditDiskModel.java @@ -155,4 +155,14 @@ getIsReadOnly().setIsChangable(false); } } + + @Override + protected void updateStorageDomains(final StoragePool datacenter) { + // do nothing + } + + @Override + protected void updateVolumeType(StorageType storageType) { + // do nothing + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java index 4a3f982..b3cb465 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewDiskModel.java @@ -249,4 +249,10 @@ private boolean isSelectionsEmpty(ListModel listModel) { return listModel.getSelectedItems() == null || listModel.getSelectedItems().isEmpty(); } + + @Override + protected void updateVolumeType(StorageType storageType) { + getVolumeType().setSelectedItem(storageType.isBlockDomain() ? VolumeType.Preallocated : VolumeType.Sparse); + volumeType_SelectedItemChanged(); + } } -- To view, visit http://gerrit.ovirt.org/24559 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78c4cf073063b0f5cdd8d76423bd5ce18cd9e27e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sergey Gotliv <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
