Tomas Jelinek has uploaded a new change for review.

Change subject: webadmin: VM's template information is inconsistent after 
upgrading to 3.4
......................................................................

webadmin: VM's template information is inconsistent after upgrading to 3.4

Having a thin provisioned VM created in 3.3 and updated it to 3.5 the VM
General subtab showed:
"TemplateName"
But if created in 3.4 and later it showd:
"TemplateName (Thin/Dependent)"

This patch unifies it so also the older VMs show up in the new format.

Change-Id: Ie55359039cf45a758f132e8c797f033f73222457
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1084940
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmTemplateNameRenderer.java
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/30781/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmTemplateNameRenderer.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmTemplateNameRenderer.java
index 3c40c3a..1ad20f7 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmTemplateNameRenderer.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmTemplateNameRenderer.java
@@ -12,6 +12,12 @@
     public String render(VM vm) {
         if (vm.getOriginalTemplateName() == null) {
             // fallback for VMs created before adding the support for original 
template
+            if (!Guid.Empty.equals(vm.getVmtGuid())) {
+                // it is a thin provisioned VM, just the original template is 
not filled
+                return 
messages.vmTemplateWithThinProvisioning(vm.getVmtName());
+            }
+
+            // no information if it was based on original template or a blank 
template - falling back show Blank as it was before 3.4
             return vm.getVmtName();
         } else if (Guid.Empty.equals(vm.getOriginalTemplateGuid())) {
             // created from blank template - don't wrap with the message


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie55359039cf45a758f132e8c797f033f73222457
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to