Tal Nisan has uploaded a new change for review.

Change subject: webadmin: Wipe checkbox is not set correctly in edit disk 
(#852027)
......................................................................

webadmin: Wipe checkbox is not set correctly in edit disk (#852027)

https://bugzilla.redhat.com/852027

When editing a disk, wipe after delete checkbox was not set correctly
according to the actual state in the disk entity, this was caused because
of a race in the changeable attribute

Change-Id: Ie15a0a5707990fc6e6c317fcddf12bc30bb348ab
Signed-off-by: Tal Nisan <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/7910/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
index 8c39cdb..6a16db4 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
@@ -461,7 +461,6 @@
 
                 storage_domains storage = (storage_domains) 
diskModel.getStorageDomain().getSelectedItem();
 
-                
diskModel.getWipeAfterDelete().setEntity(disk.isWipeAfterDelete());
                 if (diskModel.getStorageDomain() != null && 
diskModel.getStorageDomain().getSelectedItem() != null)
                 {
                     StorageType storageType = storage.getstorage_type();
@@ -471,6 +470,8 @@
                     
diskModel.getWipeAfterDelete().setIsChangable(!isFileDomain);
                 }
 
+                
diskModel.getWipeAfterDelete().setEntity(disk.isWipeAfterDelete());
+
                 ArrayList<Disk> disks =
                         vmDiskListModel.getItems() != null ? Linq.<Disk> 
Cast(vmDiskListModel.getItems())
                                 : new ArrayList<Disk>();


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

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

Reply via email to