Maor Lipchuk has uploaded a new change for review. Change subject: webadmin: Add checkbox for format when remove Storage domain ......................................................................
webadmin: Add checkbox for format when remove Storage domain Add format checkbox when remove a data Storage Doman. The checkbox should be checked for Data Storage Domain since most of the use cases should be formatting it. Change-Id: Ia844883ebca19be9c4f6a26f7c34b3423bf0f2d3 Bug-Url: https://bugzilla.redhat.com/1138132 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RemoveStorageModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 2 files changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/33287/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RemoveStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RemoveStorageModel.java index 0f7afa0..bb20695 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RemoveStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RemoveStorageModel.java @@ -42,7 +42,6 @@ setFormat(new EntityModel<Boolean>()); getFormat().getEntityChangedEvent().addListener(this); getFormat().getPropertyChangedEvent().addListener(this); - getFormat().setEntity(false); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index 0edeff8..5646734 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -770,7 +770,6 @@ model.setTitle(ConstantsManager.getInstance().getConstants().removeStoragesTitle()); model.setHelpTag(HelpTag.remove_storage); model.setHashName("remove_storage"); //$NON-NLS-1$ - model.getFormat().setIsAvailable(false); StorageDomain storage = (StorageDomain) getSelectedItem(); boolean localFsOnly = storage.getStorageType() == StorageType.LOCALFS; @@ -786,8 +785,7 @@ ArrayList<VDS> hosts = (ArrayList<VDS>) returnValue; removeStorageModel.getHostList().setItems(hosts); removeStorageModel.getHostList().setSelectedItem(Linq.firstOrDefault(hosts)); - removeStorageModel.getFormat() - .setIsAvailable(storage.getStorageDomainType().isIsoOrImportExportDomain()); + removeStorageModel.getFormat().setEntity(!storage.getStorageDomainType().isIsoOrImportExportDomain()); if (hosts.isEmpty()) { UICommand tempVar = createCancelCommand("Cancel"); //$NON-NLS-1$ @@ -823,8 +821,7 @@ RemoveStorageDomainParameters tempVar = new RemoveStorageDomainParameters(storage.getId()); tempVar.setVdsId(host.getId()); - tempVar.setDoFormat(storage.getStorageDomainType().isDataDomain() ? true - : (Boolean) model.getFormat().getEntity()); + tempVar.setDoFormat((Boolean) model.getFormat().getEntity()); Frontend.getInstance().runAction(VdcActionType.RemoveStorageDomain, tempVar, null, this); } -- To view, visit http://gerrit.ovirt.org/33287 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia844883ebca19be9c4f6a26f7c34b3423bf0f2d3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
