Idan Shaby has uploaded a new change for review. Change subject: webadmin: Enabled WAD for File Domains in the UI ......................................................................
webadmin: Enabled WAD for File Domains in the UI This patch enables the "Wipe After Delete" check box for file domains in the windows "Add Virtual Disk" and "Edit Virtual Disk". Change-Id: Ib8b9f2860fd186651311814d0087c47f4083c863 Bug-Url: https://bugzilla.redhat.com/1122510 Signed-off-by: Idan Shaby <[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 M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 4 files changed, 1 insertion(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/31949/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 6e6def7..ce41cbe 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 @@ -280,7 +280,6 @@ setIsWipeAfterDelete(new EntityModel<Boolean>()); getIsWipeAfterDelete().setEntity(false); - getIsWipeAfterDelete().getEntityChangedEvent().addListener(this); setIsBootable(new EntityModel<Boolean>()); getIsBootable().setEntity(false); @@ -341,8 +340,6 @@ } protected abstract boolean isDatacenterAvailable(StoragePool dataCenter); - - protected abstract void updateWipeAfterDelete(StorageType storageType); protected abstract DiskImage getDiskImage(); @@ -777,14 +774,6 @@ return vm.getStatus() == VMStatus.Up || vm.getStatus() == VMStatus.Down || vm.getStatus() == VMStatus.Paused; } - - private void wipeAfterDelete_EntityChanged(EventArgs e) { - if (!getIsWipeAfterDelete().getIsChangable() && getIsWipeAfterDelete().getEntity()) - { - getIsWipeAfterDelete().setEntity(false); - } - } - private void attachDisk_EntityChanged(EventArgs e) { if (getIsAttachDisk().getEntity()) { @@ -844,7 +833,6 @@ StorageDomain selectedStorage = getStorageDomain().getSelectedItem(); if (selectedStorage != null) { updateVolumeType(selectedStorage.getStorageType()); - updateWipeAfterDelete(selectedStorage.getStorageType()); } updateQuota(getDataCenter().getSelectedItem()); } @@ -968,9 +956,7 @@ super.eventRaised(ev, sender, args); if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition)) { - if (sender == getIsWipeAfterDelete()) { - wipeAfterDelete_EntityChanged(args); - } else if (sender == getIsAttachDisk()) { + if (sender == getIsAttachDisk()) { attachDisk_EntityChanged(args); } else if (sender == getIsReadOnly()) { updateScsiPassthroguhChangeability(); 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 484c921..4e0dfea 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 @@ -84,19 +84,6 @@ } @Override - protected void updateWipeAfterDelete(StorageType storageType) { - if (storageType.isFileDomain()) { - getIsWipeAfterDelete().setChangeProhibitionReason(CONSTANTS.wipeAfterDeleteNotSupportedForFileDomains()); - getIsWipeAfterDelete().setIsChangable(false); - } - else { - getIsWipeAfterDelete().setIsChangable(true); - } - - getIsWipeAfterDelete().setEntity(getDisk().isWipeAfterDelete()); - } - - @Override public void setDefaultInterface() { getDiskInterface().setSelectedItem(getDisk().getDiskInterface()); } 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 b6609b4..c871f24 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 @@ -130,19 +130,6 @@ } @Override - protected void updateWipeAfterDelete(StorageType storageType) { - if (storageType.isFileDomain()) { - getIsWipeAfterDelete().setChangeProhibitionReason(CONSTANTS.wipeAfterDeleteNotSupportedForFileDomains()); - getIsWipeAfterDelete().setIsChangable(false); - getIsWipeAfterDelete().setEntity(false); - } - else { - getIsWipeAfterDelete().setIsChangable(true); - getIsWipeAfterDelete().setEntity((Boolean) AsyncDataProvider.getConfigValuePreConverted(ConfigurationValues.SANWipeAfterDelete)); - } - } - - @Override public void setDefaultInterface() { getDiskInterface().setSelectedItem(DiskInterface.VirtIO); } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 7ecf8d3..aca2139 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -1779,9 +1779,6 @@ @DefaultStringValue("Shareable Disk is not supported by the selected configuration") String shareableDiskNotSupportedByConfiguration(); - @DefaultStringValue("Wipe after delete is not supported for file domains") - String wipeAfterDeleteNotSupportedForFileDomains(); - @DefaultStringValue("Moving disk(s) while the VM is running") String liveStorageMigrationWarning(); -- To view, visit http://gerrit.ovirt.org/31949 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8b9f2860fd186651311814d0087c47f4083c863 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Idan Shaby <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
