Daniel Erez has uploaded a new change for review.
Change subject: webadmin: column sorting support for Storage sub-tabs
......................................................................
webadmin: column sorting support for Storage sub-tabs
Enabled column sorting for sub-tabs under Storage main-tab.
Note:
column sorting isn't supported for tree-based sub-tabs,
hence, sorting for VMs/Templates sub-tabs is not applicable.
Change-Id: I210701c4498fc7a057fd1ed7154e0e9bcb572248
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDataCenterView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageIsoView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterTemplateView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterVmView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageVmBackupView.java
6 files changed, 36 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/29376/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDataCenterView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDataCenterView.java
index 1d74a9a..eb2faab 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDataCenterView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDataCenterView.java
@@ -44,6 +44,7 @@
return object.getStoragePoolName();
}
};
+ nameColumn.makeSortable();
getTable().addColumn(nameColumn, constants.nameDc(), "600px");
//$NON-NLS-1$
TextColumnWithTooltip<StorageDomain> domainStatusColumn =
@@ -53,6 +54,7 @@
return object.getStatus();
}
};
+ domainStatusColumn.makeSortable();
getTable().addColumn(domainStatusColumn,
constants.domainStatusInDcStorageDc(), "300px"); //$NON-NLS-1$
getTable().addActionButton(new
WebAdminButtonDefinition<StorageDomain>(constants.attachStorageDc()) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageIsoView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageIsoView.java
index 65ed7ef..d691e25 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageIsoView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageIsoView.java
@@ -38,6 +38,7 @@
return object.getRepoImageTitle();
}
};
+ fileNameColumn.makeSortable();
getTable().addColumn(fileNameColumn, constants.fileNameIso(),
"500px"); //$NON-NLS-1$
TextColumnWithTooltip<RepoImage> typeColumn = new
TextColumnWithTooltip<RepoImage>() {
@@ -46,6 +47,7 @@
return object.getFileType().toString();
}
};
+ typeColumn.makeSortable();
getTable().addColumn(typeColumn, constants.typeIso(), "200px");
//$NON-NLS-1$
TextColumnWithTooltip<RepoImage> sizeColumn = new
DiskSizeColumn<RepoImage>(SizeConverter.SizeUnit.BYTES,
@@ -55,6 +57,7 @@
return object.getSize();
}
};
+ sizeColumn.makeSortable();
getTable().addColumn(sizeColumn, constants.actualSizeTemplate(),
"100px"); //$NON-NLS-1$
getTable().addActionButton(new
WebAdminButtonDefinition<RepoImage>(constants.importImage()) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterTemplateView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterTemplateView.java
index 475dda8..1e8fb1d 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterTemplateView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterTemplateView.java
@@ -39,6 +39,7 @@
return object.getName();
}
};
+ nameColumn.makeSortable();
getTable().addColumn(nameColumn, constants.nameVm(), "150px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> originColumn = new
EnumColumn<VmTemplate, OriginType>() {
@@ -47,6 +48,7 @@
return object.getOrigin();
}
};
+ originColumn.makeSortable();
getTable().addColumn(originColumn, constants.originVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> memoryColumn = new
TextColumnWithTooltip<VmTemplate>() {
@@ -55,6 +57,7 @@
return String.valueOf(object.getMemSizeMb()) + " MB";
//$NON-NLS-1$
}
};
+ memoryColumn.makeSortable();
getTable().addColumn(memoryColumn, constants.memoryVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> cpuColumn = new
TextColumnWithTooltip<VmTemplate>() {
@@ -63,6 +66,7 @@
return String.valueOf(object.getNumOfCpus());
}
};
+ cpuColumn.makeSortable();
getTable().addColumn(cpuColumn, constants.cpusVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> archColumn = new
TextColumnWithTooltip<VmTemplate>() {
@@ -71,6 +75,7 @@
return String.valueOf(object.getClusterArch());
}
};
+ archColumn.makeSortable();
getTable().addColumn(archColumn, constants.architectureVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> numOfDisksColumn = new
TextColumnWithTooltip<VmTemplate>() {
@@ -79,6 +84,7 @@
return String.valueOf(object.getDiskTemplateMap().size());
}
};
+ numOfDisksColumn.makeSortable();
getTable().addColumn(numOfDisksColumn, constants.disksVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> creationDateColumn = new
GeneralDateTimeColumn<VmTemplate>() {
@@ -87,6 +93,7 @@
return object.getCreationDate();
}
};
+ creationDateColumn.makeSortable();
getTable().addColumn(creationDateColumn, constants.creationDateVm(),
"200px"); //$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> exportDateColumn = new
GeneralDateTimeColumn<VmTemplate>() {
@@ -95,6 +102,7 @@
return object.getExportDate();
}
};
+ exportDateColumn.makeSortable();
getTable().addColumn(exportDateColumn, constants.exportDateVm(),
"200px"); //$NON-NLS-1$
getTable().addActionButton(new
WebAdminButtonDefinition<VmTemplate>(constants.restoreVm()) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterVmView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterVmView.java
index c77004d..1350848 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterVmView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageRegisterVmView.java
@@ -39,6 +39,7 @@
return object.getName();
}
};
+ nameColumn.makeSortable();
getTable().addColumn(nameColumn, constants.nameVm(), "150px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> originColumn = new EnumColumn<VM,
OriginType>() {
@@ -47,6 +48,7 @@
return object.getOrigin();
}
};
+ originColumn.makeSortable();
getTable().addColumn(originColumn, constants.originVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> memoryColumn = new
TextColumnWithTooltip<VM>() {
@@ -55,6 +57,7 @@
return String.valueOf(object.getVmMemSizeMb()) + " MB";
//$NON-NLS-1$
}
};
+ memoryColumn.makeSortable();
getTable().addColumn(memoryColumn, constants.memoryVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> cpuColumn = new TextColumnWithTooltip<VM>() {
@@ -63,6 +66,7 @@
return String.valueOf(object.getNumOfCpus());
}
};
+ cpuColumn.makeSortable();
getTable().addColumn(cpuColumn, constants.cpusVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> archColumn = new TextColumnWithTooltip<VM>()
{
@@ -71,6 +75,7 @@
return String.valueOf(object.getClusterArch());
}
};
+ archColumn.makeSortable();
getTable().addColumn(archColumn, constants.architectureVm(), "100px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> numOfDisksColumn = new
TextColumnWithTooltip<VM>() {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java
index 7100cfd..846f37f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageTemplateBackupView.java
@@ -42,6 +42,7 @@
return object.getName();
}
};
+ nameColumn.makeSortable();
getTable().addColumn(nameColumn, constants.nameTemplate(), "160px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> versionNameColumn = new
TextColumnWithTooltip<VmTemplate>() {
@@ -56,6 +57,7 @@
object.getTemplateVersionNumber());
}
};
+ versionNameColumn.makeSortable();
table.addColumn(versionNameColumn, constants.versionTemplate(),
"150px"); //$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> originColumn =
@@ -66,6 +68,7 @@
.toString();
}
};
+ originColumn.makeSortable();
getTable().addColumn(originColumn, constants.originTemplate(),
"160px"); //$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> memoryColumn =
@@ -75,6 +78,7 @@
return String.valueOf(object.getMemSizeMb()) + " MB";
//$NON-NLS-1$
}
};
+ memoryColumn.makeSortable();
getTable().addColumn(memoryColumn, constants.memoryTemplate(),
"160px"); //$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> cpuColumn =
@@ -84,6 +88,7 @@
return String.valueOf(object.getNumOfCpus());
}
};
+ cpuColumn.makeSortable();
getTable().addColumn(cpuColumn, constants.cpusVm(), "160px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> archColumn =
@@ -93,6 +98,7 @@
return String.valueOf(object.getClusterArch());
}
};
+ archColumn.makeSortable();
getTable().addColumn(archColumn, constants.architectureVm(), "160px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> diskColumn =
@@ -102,6 +108,7 @@
return String.valueOf(object.getDiskList().size());
}
};
+ diskColumn.makeSortable();
getTable().addColumn(diskColumn, constants.disksTemplate(), "160px");
//$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> creationDateColumn =
@@ -111,6 +118,7 @@
return object.getCreationDate();
}
};
+ creationDateColumn.makeSortable();
getTable().addColumn(creationDateColumn,
constants.creationDateTemplate(), "160px"); //$NON-NLS-1$
TextColumnWithTooltip<VmTemplate> exportDateColumn =
@@ -120,6 +128,7 @@
return object.getExportDate();
}
};
+ exportDateColumn.makeSortable();
getTable().addColumn(exportDateColumn, constants.exportDateTemplate(),
"160px"); //$NON-NLS-1$
getTable().addActionButton(new
WebAdminButtonDefinition<VmTemplate>(constants.restoreVm()) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageVmBackupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageVmBackupView.java
index d320702..e2c0a04 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageVmBackupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageVmBackupView.java
@@ -79,6 +79,7 @@
return object.getName();
}
};
+ nameColumn.makeSortable();
getTable().addColumn(nameColumn, constants.nameVm(), "95px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> templateColumn = new
TextColumnWithTooltip<VM>() {
@@ -87,6 +88,7 @@
return vmTemplateNameRenderer.render(object);
}
};
+ templateColumn.makeSortable();
getTable().addColumn(templateColumn, constants.templateVm(), "95px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> originColumn = new EnumColumn<VM,
OriginType>() {
@@ -95,6 +97,7 @@
return object.getOrigin();
}
};
+ originColumn.makeSortable();
getTable().addColumn(originColumn, constants.originVm(), "95px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> memoryColumn = new
TextColumnWithTooltip<VM>() {
@@ -103,6 +106,7 @@
return String.valueOf(object.getVmMemSizeMb()) + " MB";
//$NON-NLS-1$
}
};
+ memoryColumn.makeSortable();
getTable().addColumn(memoryColumn, constants.memoryVm(), "95px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> cpuColumn = new TextColumnWithTooltip<VM>() {
@@ -111,6 +115,7 @@
return String.valueOf(object.getNumOfCpus());
}
};
+ cpuColumn.makeSortable();
getTable().addColumn(cpuColumn, constants.cpusVm(), "95px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> archColumn = new TextColumnWithTooltip<VM>()
{
@@ -119,6 +124,7 @@
return String.valueOf(object.getClusterArch());
}
};
+ archColumn.makeSortable();
getTable().addColumn(archColumn, constants.architectureVm(), "95px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> diskColumn = new TextColumnWithTooltip<VM>()
{
@@ -127,6 +133,7 @@
return String.valueOf(object.getDiskMap().size());
}
};
+ diskColumn.makeSortable();
getTable().addColumn(diskColumn, constants.disksVm(), "95px");
//$NON-NLS-1$
TextColumnWithTooltip<VM> creationDateColumn = new
GeneralDateTimeColumn<VM>() {
@@ -135,6 +142,7 @@
return object.getVmCreationDate();
}
};
+ creationDateColumn.makeSortable();
getTable().addColumn(creationDateColumn, constants.creationDateVm(),
"95px"); //$NON-NLS-1$
TextColumnWithTooltip<VM> exportDateColumn = new
GeneralDateTimeColumn<VM>() {
@@ -143,6 +151,7 @@
return object.getExportDate();
}
};
+ exportDateColumn.makeSortable();
getTable().addColumn(exportDateColumn, constants.exportDateVm(),
"95px"); //$NON-NLS-1$
getTable().addActionButton(new
WebAdminButtonDefinition<VM>(constants.restoreVm()) {
--
To view, visit http://gerrit.ovirt.org/29376
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I210701c4498fc7a057fd1ed7154e0e9bcb572248
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
