[Engine-patches] Change in ovirt-engine[master]: webadmin: Tooltip in Disks subtab shows Original Allocation ...

[smelamud]

Hello Shmuel Melamud,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/41071

to review the following change.

Change subject: webadmin: Tooltip in Disks subtab shows Original Allocation 
Policy
......................................................................

webadmin: Tooltip in Disks subtab shows Original Allocation Policy

1. Select a VM in Virtual Machines list.
2. Select Disks subtab.
3. Select Images radio button.

Allocation Policy column in the disks table shows current allocation
policy of the disk. If snapshots were created, the current allocation
policy will be always "Thin provision", while allocation policy of the
original disk may be different.

To make the original allocation policy easily accessible, tooltip was
added to the Allocation Policy column. The original allocation policy is
displayed in the tooltip.

Change-Id: I267eb950c57f4c5cca92d5fdd04e1294b1b2f2b0
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1117003
Signed-off-by: Shmuel Melamud <smela...@redhat.com>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
2 files changed, 24 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/41071/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index 7140b84..7e92e4d 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -1023,6 +1023,9 @@
     @DefaultStringValue("Allocation Policy")
     String allocationDisk();
 
+    @DefaultStringValue("Original Allocation Policy")
+    String originalAllocationDisk();
+
     @DefaultStringValue("Volume Type")
     String cinderVolumeTypeDisk();
 
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
index baee374..fc16280 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
@@ -12,6 +12,7 @@
 import org.ovirt.engine.core.common.businessentities.storage.StorageType;
 import org.ovirt.engine.core.common.businessentities.storage.VolumeType;
 import org.ovirt.engine.core.common.utils.SizeConverter;
+import org.ovirt.engine.core.compat.StringFormat;
 import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.ui.common.CommonApplicationConstants;
 import org.ovirt.engine.ui.common.CommonApplicationMessages;
@@ -239,6 +240,26 @@
                         object.getDiskStorageType() == DiskStorageType.CINDER ?
                         ((DiskImage) object).getVolumeType() : null;
             }
+
+            @Override
+            public SafeHtml getTooltip(Disk object) {
+                if (object.getDiskStorageType() != DiskStorageType.IMAGE &&
+                        object.getDiskStorageType() != DiskStorageType.CINDER) 
{
+                    return null;
+                }
+
+                DiskImage diskImage = (DiskImage) object;
+                if (diskImage.getSnapshots().isEmpty()) {
+                    return null;
+                }
+
+                VolumeType originalVolumeType =
+                        
diskImage.getSnapshots().get(diskImage.getSnapshots().size() - 
1).getVolumeType();
+                return SafeHtmlUtils.fromString(
+                        StringFormat.format("%s: %s",  //$NON-NLS-1$
+                                
AssetProvider.getConstants().originalAllocationDisk(),
+                                
EnumTranslator.getInstance().translate(originalVolumeType)));
+            }
         };
 
         return makeSortable(column, sortBy);


-- 
To view, visit https://gerrit.ovirt.org/41071
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I267eb950c57f4c5cca92d5fdd04e1294b1b2f2b0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shmuel Leib Melamud <smela...@redhat.com>
Gerrit-Reviewer: Shmuel Melamud <smela...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches