Asaf Shakarchi has uploaded a new change for review. Change subject: userportal: Modified columns in Templates->Disk subtab ......................................................................
userportal: Modified columns in Templates->Disk subtab In PowerUser interface, changed the following columns in Templates->Disks subtab: - Removed format column. - 'Actual Size' column now displays the actual size (and not the virtual size as it was before this patch) - Added 'Virtual Size' column. - Added 'Creation Date' column. Change-Id: I0a9fb68e1b11db19db6b617a4269879a45109a29 Bug-Url: https://bugzilla.redhat.com/864511 Signed-off-by: Asaf Shakarchi <a...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/8729/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java index 5c754bc..5862b6b 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateDiskListModelTable.java @@ -1,13 +1,17 @@ package org.ovirt.engine.ui.common.widget.uicommon.template; +import java.util.Date; + import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskInterface; -import org.ovirt.engine.core.common.businessentities.VolumeFormat; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.system.ClientStorage; import org.ovirt.engine.ui.common.uicommon.model.SearchableTableModelProvider; +import org.ovirt.engine.ui.common.widget.renderer.DiskSizeRenderer.DiskSizeUnit; +import org.ovirt.engine.ui.common.widget.table.column.DiskSizeColumn; import org.ovirt.engine.ui.common.widget.table.column.EnumColumn; +import org.ovirt.engine.ui.common.widget.table.column.FullDateTimeColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.common.widget.uicommon.AbstractModelBoundTableWidget; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateDiskListModel; @@ -32,21 +36,22 @@ }; getTable().addColumn(nameColumn, constants.nameDisk()); - TextColumnWithTooltip<DiskImage> sizeColumn = new TextColumnWithTooltip<DiskImage>() { + TextColumnWithTooltip<DiskImage> provisionedSizeColumn = new TextColumnWithTooltip<DiskImage>() { @Override public String getValue(DiskImage object) { return String.valueOf(object.getSizeInGigabytes()) + " GB"; //$NON-NLS-1$ } }; - getTable().addColumn(sizeColumn, constants.sizeDisk()); + getTable().addColumn(provisionedSizeColumn, constants.provisionedSizeDisk()); - TextColumnWithTooltip<DiskImage> formatColumn = new EnumColumn<DiskImage, VolumeFormat>() { + DiskSizeColumn<DiskImage> actualSizeColumn = new DiskSizeColumn<DiskImage>(DiskSizeUnit.GIGABYTE) { @Override - protected VolumeFormat getRawValue(DiskImage object) { - return object.getvolume_format(); + protected Long getRawValue(DiskImage object) { + return Math.round((object.getActualDiskWithSnapshotsSize())); } }; - getTable().addColumn(formatColumn, constants.formatDisk()); + + getTable().addColumn(actualSizeColumn, constants.sizeDisk()); TextColumnWithTooltip<DiskImage> allocationColumn = new EnumColumn<DiskImage, VolumeType>() { @Override @@ -63,6 +68,15 @@ } }; getTable().addColumn(interfaceColumn, constants.interfaceDisk()); + + TextColumnWithTooltip<DiskImage> dateCreatedColumn = new FullDateTimeColumn<DiskImage>() { + @Override + protected Date getRawValue(DiskImage object) { + return object.getcreation_date(); + } + }; + + getTable().addColumn(dateCreatedColumn, constants.creationDateDisk()); } } -- To view, visit http://gerrit.ovirt.org/8729 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a9fb68e1b11db19db6b617a4269879a45109a29 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Asaf Shakarchi <a...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
