Tal Nisan has uploaded a new change for review.

Change subject: webadmin: Allow adding of NFS export/ISO domains to a local DC
......................................................................

webadmin: Allow adding of NFS export/ISO domains to a local DC

Change-Id: I7122566506fe4b146fa8e3035c5656303a6bd9ae
Bug-Url: https://bugzilla.redhat.com/1097837
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/27746/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java
index b68b817..5e79bc4 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NewEditStorageModelBehavior.java
@@ -86,8 +86,12 @@
             return;
         }
 
-        // Local types should not be selectable for shared data centers and 
vice versa
-        if (isLocalStorage(item) != dataCenter.isLocal()) {
+        boolean isExportDomain = item.getRole() == 
StorageDomainType.ImportExport;
+        boolean isIsoDomain = item.getRole() == StorageDomainType.ISO;
+
+        // Local types should not be selectable for shared data centers and 
vice versa, only exception is an
+        // export/import and ISO domains which can be added as NFS
+        if (!(isExportDomain || isIsoDomain) && isLocalStorage(item) != 
dataCenter.isLocal()) {
             updateItemSelectability(item, false);
             return;
         }
@@ -101,11 +105,9 @@
             return;
         }
 
-        boolean isExportDomain = item.getRole() == 
StorageDomainType.ImportExport;
         boolean canAttachExportDomain = isNoExportOrIsoStorageAttached &&
                 dataCenter.getStatus() != StoragePoolStatus.Uninitialized;
 
-        boolean isIsoDomain = item.getRole() == StorageDomainType.ISO;
         boolean canAttachIsoDomain = isNoExportOrIsoStorageAttached &&
                 dataCenter.getStatus() != StoragePoolStatus.Uninitialized;
 


-- 
To view, visit http://gerrit.ovirt.org/27746
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7122566506fe4b146fa8e3035c5656303a6bd9ae
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

Reply via email to