Change in ovirt-engine[ovirt-engine-4.1]: webadmin: detect base template correctly on import template
From Tal Nisan <tnisan(a)redhat.com>:
Tal Nisan has submitted this change and it was merged. ( https://gerrit.ovirt.org/81078 )
Change subject: webadmin: detect base template correctly on import template
......................................................................
webadmin: detect base template correctly on import template
The problem was that while the template is being imported, it is checked, if
the template has it's base template already in the system. If not, the template
has to be imported as clone.
The problem was, that when the template was a base template, it was always
enforced to be imported to the system as a clone.
Fixed by a proper check. The patch also contains one additional null check to
make sure the frontend does not throw a NPE while leaving the screen.
Change-Id: I8499d4bdc35b3ef50a723d42143691cd267ceb80
Bug-Url: https://bugzilla.redhat.com/1485804
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Tomas Jelinek: Verified; Looks good to me, approved
Jakub Niedermertl: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/81078
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8499d4bdc35b3ef50a723d42143691cd267ceb80
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.1
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Jakub Niedermertl <jniederm(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>