Gilad Chaplik has uploaded a new change for review.

Change subject: webadmin: import: storage drop down is empty (#856976)
......................................................................

webadmin: import: storage drop down is empty (#856976)

https://bugzilla.redhat.com/856976

In case 2 different vms (or more) are dependent on a template,
only one vm disks will have a storage dropdown filled (that happened
because each vm override the other vm disks).

Change-Id: Ib29a104cd7069586798ec87b1e06d74e51c3e6be
Signed-off-by: Gilad Chaplik <[email protected]>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/8156/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
index 38a65bb..64d47a0 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
@@ -332,7 +332,10 @@
         for (Object item : getItems()) {
             VM vm = (VM) item;
             if (!NGuid.Empty.equals(vm.getvmt_guid())) {
-                templateDiskMap.put(vm.getvmt_guid(), new 
ArrayList<Disk>(vm.getDiskMap().values()));
+                if (!templateDiskMap.containsKey(vm.getvmt_guid())) {
+                    templateDiskMap.put(vm.getvmt_guid(), new 
ArrayList<Disk>());
+                }
+                
templateDiskMap.get(vm.getvmt_guid()).addAll(vm.getDiskMap().values());
             } else {
                 for (Disk disk : vm.getDiskMap().values()) {
                     DiskImage diskImage = (DiskImage) disk;


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

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

Reply via email to