Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1140 from mcintyre94/CA-112317

Browse Source 
CA-112317: Sorting on SR storage tab is incorrect
This commit is contained in:
Gabor Apati-Nagy 2016-08-30 15:57:47 +01:00 committed by GitHub
commit b510dbe8c7
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
XenAdmin/TabPages/SrStoragePage.cs
View File

@ -51,6 +51,8 @@ namespace XenAdmin.TabPages
private SR sr;
private readonly DataGridViewColumn sizeColumn;
private readonly DataGridViewColumn storageLinkVolumeColumn;
private readonly DataGridViewColumn nameColumn;
private readonly DataGridViewColumn descriptionColumn;
private bool rebuildRequired;
private readonly VDIsDataGridViewBuilder dataGridViewBuilder;
@ -61,6 +63,9 @@ namespace XenAdmin.TabPages
storageLinkVolumeColumn = ColumnVolume;
sizeColumn = ColumnSize;
nameColumn = ColumnName;
descriptionColumn = ColumnDesc;
for (int i = 0; i < 5; i++)
{
dataGridViewVDIs.Columns[i].SortMode = DataGridViewColumnSortMode.Automatic;
@ -275,6 +280,44 @@ namespace XenAdmin.TabPages
#region datagridviewevents
void DataGridViewObject_SortCompare(object sender, DataGridViewSortCompareEventArgs e)
{
if (e.Column.Index == nameColumn.Index)
{
var vdi1 = ((VDIRow) dataGridViewVDIs.Rows[e.RowIndex1]).VDI;
var vdi2 = ((VDIRow) dataGridViewVDIs.Rows[e.RowIndex2]).VDI;
var nameCompare = StringUtility.NaturalCompare(vdi1.Name, vdi2.Name);
if (nameCompare != 0)
{
e.SortResult = nameCompare;
}
else
{
var uuidCompare = String.Compare(vdi1.uuid, vdi2.uuid, StringComparison.Ordinal);
e.SortResult = uuidCompare;
}
e.Handled = true;
return;
}
if (e.Column.Index == descriptionColumn.Index)
{
var vdi1 = ((VDIRow)dataGridViewVDIs.Rows[e.RowIndex1]).VDI;
var vdi2 = ((VDIRow)dataGridViewVDIs.Rows[e.RowIndex2]).VDI;
var descCompare = StringUtility.NaturalCompare(vdi1.Description, vdi2.Description);
if (descCompare != 0)
{
e.SortResult = descCompare;
}
else
{
var uuidCompare = String.Compare(vdi1.uuid, vdi2.uuid, StringComparison.Ordinal);
e.SortResult = uuidCompare;
}
e.Handled = true;
return;
}
if (e.Column.Index == sizeColumn.Index)
{
VDI vdi1 = ((VDIRow)dataGridViewVDIs.Rows[e.RowIndex1]).VDI;