Shubhendu Tripathi has uploaded a new change for review.
Change subject: webadmin: Add an indicator if volume snapshot is scheduled
......................................................................
webadmin: Add an indicator if volume snapshot is scheduled
Added an indicator column to volume tab, to indicate if
volume snapshot creation is scheduled.
Change-Id: I4ea607285caaa343c389813681bd9e782381ae86
Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java
A
frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/snapshot_scheduled.png
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
5 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/40410/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java
index a422233..4dcfd9a 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationResources.java
@@ -179,6 +179,9 @@
@Source("images/volume_georep_slave.png")
ImageResource volumeGeoRepSlave();
+ @Source("images/snapshot_scheduled.png")
+ ImageResource snapshotScheduledImage();
+
// Model-bound widgets
@Source("images/snapshot.png")
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/snapshot_scheduled.png
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/snapshot_scheduled.png
new file mode 100644
index 0000000..33801b2
--- /dev/null
+++
b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/images/snapshot_scheduled.png
Binary files differ
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index 8d30b67..149a31e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -4026,9 +4026,6 @@
@DefaultStringValue("Snapshot")
String volumeSnapshotMainTabTitle();
- @DefaultStringValue("Snapshot Scheduled")
- String snapshotScheduledLabel();
-
@DefaultStringValue("Options - Cluster")
String configureClusterSnapshotOptions();
@@ -4148,4 +4145,7 @@
@DefaultStringValue("Warning : Recommendations for geo-replication not met
-")
String geoReplicationRecommendedConfigViolation();
+
+ @DefaultStringValue("Volume snapshots are scheduled.")
+ String glusterVolumeSnapshotsScheduledToolTip();
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
index bf93603..58c235e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabVolumeView.java
@@ -168,16 +168,6 @@
snapshotCountColumn.makeSortable();
getTable().addColumn(snapshotCountColumn,
constants.noOfSnapshotsLabel(), "100px"); //$NON-NLS-1$
- TextColumnWithTooltip<GlusterVolumeEntity> snapshotScheduledColumn =
- new TextColumnWithTooltip<GlusterVolumeEntity>() {
- @Override
- public String getValue(GlusterVolumeEntity object) {
- return object.getSnapshotScheduled().toString();
- }
- };
- snapshotScheduledColumn.makeSortable();
- getTable().addColumn(snapshotScheduledColumn,
constants.snapshotScheduledLabel(), "100px"); //$NON-NLS-1$
-
getTable().addActionButton(new
WebAdminButtonDefinition<GlusterVolumeEntity>(constants.newVolume()) {
@Override
protected UICommand resolveCommand() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
index dbf6e91..8ccc1fc 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeInfoCell.java
@@ -23,6 +23,7 @@
protected ImageResource geoRepMasterImage = resources.volumeGeoRepMaster();
protected ImageResource geoRepSlaveImage = resources.volumeGeoRepSlave();
+ protected ImageResource snapshotScheduledImage =
resources.snapshotScheduledImage();
@Override
public void render(Context context, GlusterVolumeEntity volume,
SafeHtmlBuilder sb) {
@@ -44,6 +45,12 @@
sb.append(applicationTemplates.statusTemplate(geoRepSlaveHtml,
messages.geoRepSlaveVolumeToolTip(volName, clusterName)));
}
+ if (volume.getSnapshotScheduled()) {
+ SafeHtml snapshotScheduledHtml =
+
SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(snapshotScheduledImage).getHTML());
+
sb.append(applicationTemplates.statusTemplate(snapshotScheduledHtml,
+ constants.glusterVolumeSnapshotsScheduledToolTip()));
+ }
}
private String[] formatVolClusterName(String volClusterName) {
--
To view, visit https://gerrit.ovirt.org/40410
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ea607285caaa343c389813681bd9e782381ae86
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5-gluster
Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
