Vered Volansky has uploaded a new change for review. Change subject: webadmin: Disable update RO and WipeAfterDelete ......................................................................
webadmin: Disable update RO and WipeAfterDelete Disable editing the RO and WipeAfterDelete properties of disks when editing a disk of a VM that's attached to a VM pool. Change-Id: I9d12cd00ff1e56bfb44e60fe7e50d66bef630820 Bug-Url: https://bugzilla.redhat.com/1057721 Signed-off-by: Vered Volansky <vvola...@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/EditDiskModel.java 2 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/35468/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 9e03180..f63a14b 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 @@ -719,9 +719,20 @@ return; } - - getIsReadOnly().setIsChangable(isEditEnabled()); + if (isVmAttachedToPool() && !getIsNew()) { + getIsReadOnly().setIsChangable(false); + } else { + getIsReadOnly().setIsChangable(isEditEnabled()); + } getIsReadOnly().setEntity(getIsNew() ? Boolean.FALSE : getDisk().getReadOnly()); + } + + protected void updateWipeAfterDeleteChangeability() { + if (isVmAttachedToPool()) { + getIsWipeAfterDelete().setIsChangable(false); + } else { + getIsWipeAfterDelete().setIsChangable(isEditEnabled()); + } } private void updatePlugChangeability() { @@ -754,6 +765,10 @@ return vm.getStatus() == VMStatus.Up || vm.getStatus() == VMStatus.Down || vm.getStatus() == VMStatus.Paused; } + private boolean isVmAttachedToPool() { + return getVm() != null && getVm().getVmPoolId() != null; + } + private void datacenter_SelectedItemChanged() { StoragePool datacenter = getDataCenter().getSelectedItem(); boolean isInVm = getVm() != null; 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 fd60a9e..0c3e0cc 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 @@ -71,6 +71,7 @@ } updateReadOnlyChangeability(); + updateWipeAfterDeleteChangeability(); } @Override -- To view, visit http://gerrit.ovirt.org/35468 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d12cd00ff1e56bfb44e60fe7e50d66bef630820 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvola...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
