Maor Lipchuk has uploaded a new change for review. Change subject: <core | restapi | tools | history | engine | userportal | webadmin>: short summary under 50 chars ......................................................................
<core | restapi | tools | history | engine | userportal | webadmin>: short summary under 50 chars Longer description using lines' length under 72 chars. With multiple paragraphs if necessary. Change-Id: Ifae810356f33d94f05a1fca4035c8f44fbe2dc19 Bug-Url: https://bugzilla.redhat.com/?????? 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/38/35738/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 c52af14..59137fa 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 69e251a..d7a2342 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 @@ -429,10 +429,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); @@ -440,9 +445,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 da11e12..5d697d3 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 @@ -2479,4 +2479,7 @@ @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/35738 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifae810356f33d94f05a1fca4035c8f44fbe2dc19 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
