[Engine-patches] Change in ovirt-engine[master]: webadmin: custom snapshot preview - disable illegal disks

[derez]

Daniel Erez has uploaded a new change for review.

Change subject: webadmin: custom snapshot preview - disable illegal disks
......................................................................

webadmin: custom snapshot preview - disable illegal disks

Custom snapshot preview dialog:
* Disable selection for illegal disks ('N/A' instead of a check-box).
* Show relevant tool-tip on hover.

Change-Id: Ia4f7b7fd78437d5344852f22c85a3d0e11a6c6eb
Bug-Url: https://bugzilla.redhat.com/1111984
Signed-off-by: Daniel Erez <de...@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/CommonApplicationTemplates.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
3 files changed, 13 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/29137/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 3bc2ef2..ba79c5a 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
@@ -1342,6 +1342,9 @@
     @DefaultStringValue("N/A")
     String notAvailableLabel();
 
+    @DefaultStringValue("Disk in status Illegal")
+    String illegalStatus();
+
     @DefaultStringValue("CPU Pinning topology")
     String cpuPinningLabel();
 
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java
index 7b21995..ac86133 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationTemplates.java
@@ -89,4 +89,7 @@
 
     @Template("<span title='{2}'>{0} {1}</span>")
     SafeHtml iconWithTextAndTitle(SafeHtml icon, String text, String title);
+
+    @Template("<span title='{1}'>{0}</span>")
+    SafeHtml textAndTitle(String text, String title);
 }
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
index 9665aef..1b309b8 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmSnapshotCustomPreviewPopupWidget.java
@@ -21,6 +21,7 @@
 import com.google.gwt.view.client.CellPreviewEvent;
 import com.google.gwt.view.client.NoSelectionModel;
 import org.ovirt.engine.core.common.businessentities.DiskImage;
+import org.ovirt.engine.core.common.businessentities.ImageStatus;
 import org.ovirt.engine.core.common.businessentities.Snapshot;
 import org.ovirt.engine.ui.common.CommonApplicationConstants;
 import org.ovirt.engine.ui.common.CommonApplicationMessages;
@@ -235,11 +236,14 @@
                 @Override
                 public void render(Context context, SnapshotModel 
snapshotModel, SafeHtmlBuilder sb) {
                     DiskImage image = 
snapshotModel.getImageByDiskId(disk.getId());
-                    if (image != null) {
-                        super.render(context, snapshotModel, sb);
+                    if (image == null) {
+                        sb.appendEscaped(constants.notAvailableLabel());
+                    }
+                    else if (image.getImageStatus() == ImageStatus.ILLEGAL) {
+                        
sb.append(templates.textAndTitle(constants.notAvailableLabel(), 
constants.illegalStatus()));
                     }
                     else {
-                        sb.appendEscaped(constants.notAvailableLabel());
+                        super.render(context, snapshotModel, sb);
                     }
                 }
             }, 
templates.iconWithTextAndTitle(imageResourceToSafeHtml(resources.diskIcon()),


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4f7b7fd78437d5344852f22c85a3d0e11a6c6eb
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