Maor Lipchuk has uploaded a new change for review. Change subject: webadmin: Add a warning when detaching a Storage Domain ......................................................................
webadmin: Add a warning when detaching a Storage Domain Add a warning indicating that the entities reside on the Storage Domain will be removed from the setup. Change-Id: Id18794fe37e9c3717fa37abac5bf69a928c800c9 Bug-Url: https://bugzilla.redhat.com/1138133 Bug-Url: https://bugzilla.redhat.com/1138119 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 3 files changed, 22 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/35742/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java index a9d2cf0..75d687e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterStorageListModel.java @@ -494,20 +494,28 @@ model.setMessage(ConstantsManager.getInstance().getConstants().areYouSureYouWantDetachFollowingStoragesMsg()); ArrayList<String> list = new ArrayList<String>(); - for (StorageDomain item : Linq.<StorageDomain> cast(getSelectedItems())) - { + boolean shouldAddressWarnning = false; + for (StorageDomain item : Linq.<StorageDomain> cast(getSelectedItems())) { list.add(item.getStorageName()); + if (item.getStorageDomainType().isDataDomain()) { + shouldAddressWarnning = true; + break; + } } model.setItems(list); if (containsLocalStorage(model)) { + shouldAddressWarnning = false; model.getLatch().setIsAvailable(true); model.getLatch().setIsChangable(true); model.setNote(ConstantsManager.getInstance().getMessages().detachNote(getLocalStoragesFormattedString())); } + if (shouldAddressWarnning) { + model.setNote(ConstantsManager.getInstance().getConstants().detachWarnningNote()); + } UICommand tempVar = new UICommand("OnDetach", this); //$NON-NLS-1$ tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok()); tempVar.setIsDefault(true); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java index f8d3c6e..9bddab7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java @@ -433,10 +433,15 @@ model.setMessage(ConstantsManager.getInstance().getConstants().areYouSureYouWantDetachStorageFromDcsMsg()); ArrayList<String> items = new ArrayList<String>(); + boolean shouldAddressWarnning = false; for (Object item : getSelectedItems()) { StorageDomain a = (StorageDomain) item; items.add(a.getStoragePoolName()); + if (a.getStorageDomainType().isDataDomain()) { + shouldAddressWarnning = true; + break; + } } model.setItems(items); @@ -444,9 +449,12 @@ { model.getLatch().setIsAvailable(true); model.getLatch().setIsChangable(true); - + shouldAddressWarnning = false; model.setNote(ConstantsManager.getInstance().getMessages().detachNote(getLocalStoragesFormattedString())); } + if (shouldAddressWarnning) { + model.setNote(ConstantsManager.getInstance().getConstants().detachWarnningNote()); + } UICommand tempVar = new UICommand("OnDetach", this); //$NON-NLS-1$ tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok()); 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 570eb4d..b705936 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 @@ -2407,5 +2407,8 @@ @DefaultStringValue("Either Total or Read/Write can have values.") String eitherTotalOrReadWriteCanHaveValues(); + + @DefaultStringValue("The detach operation will move the entities residing on the storage domain(s) to an unregistered state. For further information please consult documentation.") + String detachWarnningNote(); } -- To view, visit http://gerrit.ovirt.org/35742 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id18794fe37e9c3717fa37abac5bf69a928c800c9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
