Tal Nisan has uploaded a new change for review. Change subject: webadmin: Show a warning on import storage dialog when import is not possible ......................................................................
webadmin: Show a warning on import storage dialog when import is not possible In the import storage dialog when selecting a data center that already has an ISO and an export domain attach there is nothing to import and the selectboxes are empty, this patch adds a warning icon with a title that explains why the boxes are empty and no import can be dome Change-Id: Icb8c8a786adb0cabc8dd2aa367531c319f712d9f Bug-Url: https://bugzilla.redhat.com/1063288 Signed-off-by: Tal Nisan <tni...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/25570/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java index b5c6e51..a7a269f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/ImportStorageModelBehavior.java @@ -10,6 +10,7 @@ import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.Model; +import org.ovirt.engine.ui.uicompat.ConstantsManager; @SuppressWarnings("unused") public class ImportStorageModelBehavior extends StorageModelBehavior @@ -77,6 +78,15 @@ onStorageModelUpdated(item); } + @Override + public void filterUnSelectableModels() { + super.filterUnSelectableModels(); + if (getModel().getAvailableStorageItems().getItems().isEmpty()) { + getModel().getDataCenterAlert().setIsAvailable(true); + getModel().getDataCenterAlert().setEntity(ConstantsManager.getInstance().getConstants().noStoragesToImport()); + } + } + private boolean isItemSelectable(IStorageModel item, StoragePool dataCenter, boolean isNoStorageAttached) { // Local SD can be attached to a local DC only if (isLocalStorage(item) && !dataCenter.isLocal()) { 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 9b11bab..f1a8554 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 @@ -216,6 +216,9 @@ @DefaultStringValue("Data Center is uninitialized, in order to initialize add a data domain") String dataCenterUninitializedAlert(); + @DefaultStringValue("The selected domain already has an ISO domain and an export domains attached") + String noStoragesToImport(); + @DefaultStringValue("Detach Storage") String detachStorageTitle(); -- To view, visit http://gerrit.ovirt.org/25570 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb8c8a786adb0cabc8dd2aa367531c319f712d9f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
