[Engine-patches] Change in ovirt-engine[master]: webadmin: block operations on ovf disks

[laravot]

Liron Ar has uploaded a new change for review.

Change subject: webadmin: block operations on ovf disks
......................................................................

webadmin: block operations on ovf disks

Change-Id: I379d10be9b6ee1cbda99d85f5dc02af78695a65c
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
1 file changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/23566/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
index dedff12..92ebe68 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
@@ -502,11 +502,14 @@
     {
         Disk disk = (Disk) getSelectedItem();
         ArrayList<Disk> disks = getSelectedItems() != null ? (ArrayList<Disk>) 
getSelectedItems() : null;
-        boolean isDiskLocked = disk != null && disk.getDiskStorageType() == 
DiskStorageType.IMAGE &&
-                ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED;
+        boolean shouldAllow = true;
+        if (disk != null) {
+            shouldAllow = !disk.isOvfStore() && !(disk.getDiskStorageType() == 
DiskStorageType.IMAGE &&
+                    ((DiskImage) disk).getImageStatus() == ImageStatus.LOCKED);
+        }
 
         getNewCommand().setIsExecutionAllowed(true);
-        getEditCommand().setIsExecutionAllowed(disk != null && disks != null 
&& disks.size() == 1 && !isDiskLocked);
+        getEditCommand().setIsExecutionAllowed(disk != null && disks != null 
&& disks.size() == 1 && shouldAllow);
         getRemoveCommand().setIsExecutionAllowed(disks != null && disks.size() 
> 0 && isRemoveCommandAvailable());
         getScanAlignmentCommand().setIsExecutionAllowed(
                 disks != null && disks.size() > 0 && 
isScanAlignmentCommandAvailable());
@@ -537,7 +540,7 @@
             }
 
             DiskImage diskImage = (DiskImage) disk;
-            if (diskImage.getImageStatus() != ImageStatus.OK || 
!datacenterId.equals(diskImage.getStoragePoolId())) {
+            if (diskImage.getImageStatus() != ImageStatus.OK || 
!datacenterId.equals(diskImage.getStoragePoolId()) || diskImage.isOvfStore()) {
                 disableMoveAndCopyCommands();
                 return;
             }


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I379d10be9b6ee1cbda99d85f5dc02af78695a65c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches