Sergey Gotliv has uploaded a new change for review. Change subject: webadmin: Fix allocation policy and storage domain when editing VM disk ......................................................................
webadmin: Fix allocation policy and storage domain when editing VM disk Edit Vm disk window always displayed disk allocation policy based on the storage type instead of displaying the actual allocation policy of that disk. In case of the storage domain, first domain from the list of availavle storage domains was displayed instead of the storage domain of that disk. Change-Id: Ifae8052b4e37a7ad7f39eb38081268a7b6bd1a43 Bug-Url: https://bugzilla.redhat.com/1057622 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, 20 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/24686/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 bb8e8fa..5e2dd6c 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 @@ -330,6 +330,8 @@ protected abstract void setDefaultInterface(); + protected abstract void updateVolumeType(StorageType storageType); + protected boolean isEditEnabled() { return getIsFloating() || getIsNew() || getVm().isDown() || !getDisk().getPlugged(); } @@ -362,7 +364,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) { @@ -530,11 +532,6 @@ setVolumeFormat(AsyncDataProvider.getDiskVolumeFormat(volumeType, storageType)); } - private void updateVolumeType(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() { @@ -644,7 +641,7 @@ updateDatacenters(); } - private void volumeType_SelectedItemChanged() { + protected void volumeType_SelectedItemChanged() { if (getVolumeType().getSelectedItem() == null || getDataCenter().getSelectedItem() == null || getStorageDomain().getSelectedItem() == null) { return; 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 b5c0f77..9bce547 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 @@ -156,4 +156,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 3fa7bbd..080af51 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 @@ -251,4 +251,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/24686 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifae8052b4e37a7ad7f39eb38081268a7b6bd1a43 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Sergey Gotliv <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
