Amit Aviram has uploaded a new change for review. Change subject: webadmin: Enabling ISO & Export path editing. ......................................................................
webadmin: Enabling ISO & Export path editing. The system currently enables to edit ISO and Export domains' path at backend. This patch adds the posibility to do that also through the webadmin. Change-Id: I0a57fa74c4bbd41272f119925fa7fef9a67b267d Bug-Url: https://bugzilla.redhat.com/1099412 Signed-off-by: Amit Aviram <aavi...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/37336/1 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 8be4f36..614a790 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 @@ -468,12 +468,20 @@ private boolean isPathEditable(StorageDomain storage) { if (storage.getStorageType().isFileDomain() && !storage.getStorageType().equals(StorageType.GLUSTERFS)) { - return ((storage.getStorageDomainType() == StorageDomainType.Data - || storage.getStorageDomainType() == StorageDomainType.Master) - && (storage.getStatus() == StorageDomainStatus.Maintenance - || storage.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached)); + return isDomainTypeValidForPathEditing(storage) && isStorageStatusValidForPathEditing(storage); } return false; + } + + private boolean isDomainTypeValidForPathEditing(StorageDomain storage) { + StorageDomainType storageDomainType = storage.getStorageDomainType(); + return (storageDomainType == StorageDomainType.Data || storageDomainType == StorageDomainType.ImportExport + || storageDomainType == StorageDomainType.ISO || storageDomainType == StorageDomainType.Master); + } + + private boolean isStorageStatusValidForPathEditing(StorageDomain storage) { + return (storage.getStatus() == StorageDomainStatus.Maintenance + || storage.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached); } private IStorageModel prepareLocalStorageForEdit(StorageDomain storage) @@ -1154,10 +1162,11 @@ || storageDomain.getStatus() == StorageDomainStatus.PreparingForMaintenance); boolean isUnattached = (storageDomain.getStorageDomainSharedStatus() == StorageDomainSharedStatus.Unattached || storageDomain.getStatus() == StorageDomainStatus.Detaching); - boolean isDataDomain = storageDomain.getStorageDomainType().isDataDomain(); + boolean isDataISOorExportDomain = storageDomain.getStorageDomainType().isDataDomain() + || storageDomain.getStorageDomainType().isIsoOrImportExportDomain(); boolean isBlockStorage = storageDomain.getStorageType().isBlockDomain(); - isEditAvailable = isActive || isBlockStorage || ((isInMaintenance || isUnattached) && isDataDomain); + isEditAvailable = isActive || isBlockStorage || ((isInMaintenance || isUnattached) && isDataISOorExportDomain); return isEditAvailable; } -- To view, visit http://gerrit.ovirt.org/37336 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a57fa74c4bbd41272f119925fa7fef9a67b267d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Amit Aviram <aavi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
