Maor Lipchuk has uploaded a new change for review.
Change subject: webadmin: add DiskStorageType column to disks table
......................................................................
webadmin: add DiskStorageType column to disks table
Adding DiskStorageType (Image/LUN/Cinder) column to disks
table ('All' view).
Change-Id: I7c72bb8a9228172a36e5a94953888b561587452c
Bug-Url: https://bugzilla.redhat.com/1185826
Signed-off-by: Maor Lipchuk <[email protected]>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
3 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/39048/1
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 6d519fc..4678cfe 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
@@ -419,6 +419,17 @@
return makeSortable(column, sortBy);
}
+ public static final AbstractTextColumn<Disk>
getDiskStorageTypeColumn(String sortBy) {
+ AbstractTextColumn<Disk> column = new AbstractEnumColumn<Disk,
DiskStorageType>() {
+ @Override
+ protected DiskStorageType getRawValue(Disk object) {
+ return object.getDiskStorageType();
+ }
+ };
+
+ return makeSortable(column, sortBy);
+ }
+
public static <C extends AbstractTextColumn<T>, T> C makeSortable(C
column, String sortBy) {
if (sortBy == null ) {
// Client sorting
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
index 5c4680a..42660fe 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/BaseVmDiskListModelTable.java
@@ -38,6 +38,7 @@
private static AbstractTextColumn<Disk> lunVendorIdColumn;
private static AbstractTextColumn<Disk> lunProductIdColumn;
private static AbstractTextColumn<Disk> interfaceColumn;
+ private static AbstractTextColumn<Disk> diskStorageTypeColumn;
private static AbstractTextColumn<Disk> descriptionColumn;
public BaseVmDiskListModelTable(
@@ -164,6 +165,9 @@
statusColumn, constants.statusDisk(), images || cinder,
"80px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
+ diskStorageTypeColumn, constants.typeDisk(), all, "80px");
//$NON-NLS-1$
+
+ getTable().ensureColumnPresent(
descriptionColumn, constants.descriptionDisk(), all || images
|| luns, "90px"); //$NON-NLS-1$
}
@@ -182,6 +186,7 @@
lunVendorIdColumn = DisksViewColumns.getLunVendorIdColumn(null);
lunProductIdColumn = DisksViewColumns.getLunProductIdColumn(null);
interfaceColumn = DisksViewColumns.getInterfaceColumn(null);
+ diskStorageTypeColumn =
DisksViewColumns.getDiskStorageTypeColumn(null);
descriptionColumn = DisksViewColumns.getDescriptionColumn(null);
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
index db48cf3..eeb5e4e 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java
@@ -62,6 +62,7 @@
private static AbstractTextColumn<Disk> lunVendorIdColumn;
private static AbstractTextColumn<Disk> lunProductIdColumn;
private static AbstractTextColumn<Disk> qoutaColumn;
+ private static AbstractTextColumn<Disk> diskStorageTypeColumn;
private static AbstractTextColumn<Disk> descriptionColumn;
@Inject
@@ -202,6 +203,9 @@
qoutaColumn, constants.quotaDisk(), images && isQuotaVisible,
"120px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
+ diskStorageTypeColumn, constants.typeDisk(), all, "80px");
//$NON-NLS-1$
+
+ getTable().ensureColumnPresent(
descriptionColumn, constants.descriptionDisk(), all || images
|| luns || cinder,
"90px"); //$NON-NLS-1$
}
@@ -220,6 +224,7 @@
lunVendorIdColumn =
DisksViewColumns.getLunVendorIdColumn(constants.empty());
lunProductIdColumn =
DisksViewColumns.getLunProductIdColumn(constants.empty());
qoutaColumn =
DisksViewColumns.getQoutaColumn(DiskConditionFieldAutoCompleter.QUOTA);
+ diskStorageTypeColumn =
DisksViewColumns.getDiskStorageTypeColumn(DiskConditionFieldAutoCompleter.DISK_TYPE);
descriptionColumn =
DisksViewColumns.getDescriptionColumn(DiskConditionFieldAutoCompleter.DESCRIPTION);
}
--
To view, visit https://gerrit.ovirt.org/39048
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c72bb8a9228172a36e5a94953888b561587452c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
