Daniel Erez has uploaded a new change for review.

Change subject: webadmin: Attach disk - verify selection
......................................................................

webadmin: Attach disk - verify selection

Fix validation that at least one disk
is selected on attach disk.

Change-Id: Idde1f85c3b1a8d31fc6a5ddd6591f493dc113b3d
Bug-Url: https://bugzilla.redhat.com/879218
Signed-off-by: Daniel Erez <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/13014/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
index 8e073d4..4946827 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/DiskModel.java
@@ -893,8 +893,7 @@
     public boolean Validate()
     {
         if ((Boolean) getIsAttachDisk().getEntity()) {
-            if (getInternalAttachableDisks().getSelectedItems() == null &&
-                getExternalAttachableDisks().getSelectedItems() == null) {
+            if (isSelectionsEmpty(getInternalAttachableDisks()) && 
isSelectionsEmpty(getExternalAttachableDisks())) {
                 getInvalidityReasons().add(CONSTANTS.noDisksSelected());
                 setIsValid(false);
                 return false;
@@ -938,6 +937,10 @@
                 && isSanStorageModelValid && getQuota().getIsValid();
     }
 
+    private boolean isSelectionsEmpty(ListModel listModel) {
+        return listModel.getSelectedItems() == null || 
listModel.getSelectedItems().isEmpty();
+    }
+
     private void ForceCreationWarning(ArrayList<String> usedLunsMessages) {
         ConfirmationModel confirmationModel = new ConfirmationModel();
         setConfirmWindow(confirmationModel);


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idde1f85c3b1a8d31fc6a5ddd6591f493dc113b3d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to