Maor Lipchuk has uploaded a new change for review.
Change subject: webadmin: add CinderVolumeType column to disks table
......................................................................
webadmin: add CinderVolumeType column to disks table
Adding CinderVolumeType column to disks tables ('Cinder' view).
Change-Id: Id7557d41be6f14404bcc3fc5eeae4bb1bf61f2e5
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/50/39050/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 4678cfe..c83a482 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
@@ -430,6 +430,17 @@
return makeSortable(column, sortBy);
}
+ public static final AbstractTextColumn<Disk>
getCinderVolumeTypeColumn(String sortBy) {
+ AbstractTextColumn<Disk> column = new AbstractTextColumn<Disk>() {
+ @Override
+ public String getValue(Disk object) {
+ return object.getCinderVolumeType();
+ }
+ };
+
+ 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 42660fe..b9905ac 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
@@ -39,6 +39,7 @@
private static AbstractTextColumn<Disk> lunProductIdColumn;
private static AbstractTextColumn<Disk> interfaceColumn;
private static AbstractTextColumn<Disk> diskStorageTypeColumn;
+ private static AbstractTextColumn<Disk> cinderVolumeTypeColumn;
private static AbstractTextColumn<Disk> descriptionColumn;
public BaseVmDiskListModelTable(
@@ -138,6 +139,9 @@
DisksViewColumns.storageTypeColumn,
constants.storageTypeDisk(), images, "100px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
+ cinderVolumeTypeColumn, constants.cinderVolumeTypeDisk(),
cinder, "80px"); //$NON-NLS-1$
+
+ getTable().ensureColumnPresent(
dateCreatedColumn, constants.creationDateDisk(), images ||
cinder, "120px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
@@ -187,6 +191,7 @@
lunProductIdColumn = DisksViewColumns.getLunProductIdColumn(null);
interfaceColumn = DisksViewColumns.getInterfaceColumn(null);
diskStorageTypeColumn =
DisksViewColumns.getDiskStorageTypeColumn(null);
+ cinderVolumeTypeColumn =
DisksViewColumns.getCinderVolumeTypeColumn(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 eeb5e4e..49d5795 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
@@ -63,6 +63,7 @@
private static AbstractTextColumn<Disk> lunProductIdColumn;
private static AbstractTextColumn<Disk> qoutaColumn;
private static AbstractTextColumn<Disk> diskStorageTypeColumn;
+ private static AbstractTextColumn<Disk> cinderVolumeTypeColumn;
private static AbstractTextColumn<Disk> descriptionColumn;
@Inject
@@ -176,6 +177,9 @@
"130px"); //$NON-NLS-1$
getTable().ensureColumnPresent(
+ cinderVolumeTypeColumn, constants.cinderVolumeTypeDisk(),
cinder, "80px"); //$NON-NLS-1$
+
+ getTable().ensureColumnPresent(
dateCreatedColumn, constants.creationDateDisk(), images ||
cinder,
"130px"); //$NON-NLS-1$
@@ -225,6 +229,7 @@
lunProductIdColumn =
DisksViewColumns.getLunProductIdColumn(constants.empty());
qoutaColumn =
DisksViewColumns.getQoutaColumn(DiskConditionFieldAutoCompleter.QUOTA);
diskStorageTypeColumn =
DisksViewColumns.getDiskStorageTypeColumn(DiskConditionFieldAutoCompleter.DISK_TYPE);
+ cinderVolumeTypeColumn =
DisksViewColumns.getCinderVolumeTypeColumn(null);
descriptionColumn =
DisksViewColumns.getDescriptionColumn(DiskConditionFieldAutoCompleter.DESCRIPTION);
}
--
To view, visit https://gerrit.ovirt.org/39050
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7557d41be6f14404bcc3fc5eeae4bb1bf61f2e5
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
