Change in ovirt-engine[master]: webadmin: fix general & app list sub-tabs on import

Arik Hadas has submitted this change and it was merged. Change subject: webadmin: fix general & app list sub-tabs on import ...................................................................... webadmin: fix general & app list sub-tabs on import We used to override 'setEntity' method in VmGeneralModel & VmAppListModel classes when using them for VM which is going to be imported, to set extract the VM from ImportVmData and use it as the entity of the model. Recently this part was dropped when switched to use DI in the import-from-export-domain model, which results in class-cast exception. This patch introduces two models, VmImportGeneralModel & VmImportAppListModel, which inherit from VmGeneralModel & VmAppListModel and override their 'setEntity' method as we did before, and these models are used from the import-model instead. Change-Id: I7235d5d6ddf953078e668b94b4d03bc136da5a77 Signed-off-by: Arik Hadas <ahadas@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportAppListModel.java A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportGeneralModel.java 4 files changed, 31 insertions(+), 10 deletions(-) Approvals: Tomas Jelinek: Looks good to me, approved Arik Hadas: Verified -- To view, visit http://gerrit.ovirt.org/36789 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7235d5d6ddf953078e668b94b4d03bc136da5a77 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: automation@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server
participants (1)
-
ahadas@redhat.com