Daniel Erez has uploaded a new change for review. Change subject: webadmin: import vm dialog - fix subtabs refresh ......................................................................
webadmin: import vm dialog - fix subtabs refresh As done in 'ImportVmModel -> initDetailModels', VmImportDiskListModel/VmImportInterfaceListModel should also override 'setEntity' to get the VM object rather than the wrapping ImportVmData EntityModel (same applies for TemplateImport models) Change-Id: Iab5f6f522d007dd88e8d6a14f9ab66f37a1adae4 Bug-Url: https://bugzilla.redhat.com/1141693 Signed-off-by: Daniel Erez <de...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportDiskListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportInterfaceListModel.java 4 files changed, 24 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/33141/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java index 8ad2637..72297ae 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportDiskListModel.java @@ -28,7 +28,7 @@ if (getEntity() != null) { ArrayList<DiskImage> list = new ArrayList<DiskImage>(); - VmTemplate template = ((ImportTemplateData) getEntity()).getTemplate(); + VmTemplate template = (VmTemplate) getEntity(); for (Map.Entry<VmTemplate, List<DiskImage>> item : extendedItems) { if (item.getKey().getQueryableId().equals(template.getQueryableId())) { list.addAll(item.getValue()); @@ -44,6 +44,11 @@ } } + @Override + public void setEntity(Object value) { + super.setEntity(value != null ? ((ImportTemplateData) value).getTemplate() : null); + } + public void setExtendedItems(ArrayList<Map.Entry<VmTemplate, List<DiskImage>>> arrayList) { this.extendedItems = arrayList; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportInterfaceListModel.java index 5faa6ae..4a2a3ca 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateImportInterfaceListModel.java @@ -18,7 +18,7 @@ if (getEntity() != null) { - VmTemplate template = ((ImportTemplateData) getEntity()).getTemplate(); + VmTemplate template = (VmTemplate) getEntity(); setItems(template.getInterfaces()); } else @@ -28,6 +28,11 @@ } @Override + public void setEntity(Object value) { + super.setEntity(value != null ? ((ImportTemplateData) value).getTemplate() : null); + } + + @Override protected void syncSearch() { } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportDiskListModel.java index b6da2bf..327beb0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportDiskListModel.java @@ -19,7 +19,7 @@ protected void onEntityChanged() { if (getEntity() != null) { - VM vm = ((ImportVmData) getEntity()).getVm(); + VM vm = (VM) getEntity(); if (vm != null && vm.getDiskMap() != null) { ArrayList<DiskImage> list = new ArrayList<DiskImage>(); @@ -39,6 +39,11 @@ } @Override + public void setEntity(Object value) { + super.setEntity(value == null ? null : ((ImportVmData) value).getVm()); + } + + @Override protected String getListName() { return "VmImportDiskListModel"; //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportInterfaceListModel.java index 05941a9..9649931 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportInterfaceListModel.java @@ -14,7 +14,7 @@ { if (getEntity() != null) { - VM vm = ((ImportVmData) getEntity()).getVm(); + VM vm = (VM) getEntity(); setItems(vm.getInterfaces()); } else @@ -24,6 +24,11 @@ } @Override + public void setEntity(Object value) { + super.setEntity(value != null ? ((ImportVmData) value).getVm() : null); + } + + @Override protected String getListName() { return "VmImportInterfaceListModel"; //$NON-NLS-1$ } -- To view, visit http://gerrit.ovirt.org/33141 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab5f6f522d007dd88e8d6a14f9ab66f37a1adae4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
