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

Fix PatchingWizard_SelectServers version sorting

Browse Source 
The problem is that pool and host rows are mixed when sorting by
version.

Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
This commit is contained in:
Ji Jiang 2017-08-14 17:01:43 +01:00
parent dfe7a2ea70
commit 0a33bf1448
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectServers.cs
View File

@ -31,6 +31,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
using XenAdmin.Controls;
@ -610,6 +611,38 @@ namespace XenAdmin.Wizards.PatchingWizard
#region Nested items
private class LocalVersionSorter : CollapsingPoolHostDataGridViewRowSorter
{
public LocalVersionSorter(ListSortDirection direction)
: base(direction)
{
}
protected override int PerformSort()
{
PatchingHostsDataGridViewRow leftSide = Lhs as PatchingHostsDataGridViewRow;
PatchingHostsDataGridViewRow rightSide = Rhs as PatchingHostsDataGridViewRow;
if (leftSide != null && rightSide != null)
{
if (leftSide.IsPoolOrStandaloneHost && !rightSide.IsPoolOrStandaloneHost)
return -1;
if (!leftSide.IsPoolOrStandaloneHost && rightSide.IsPoolOrStandaloneHost)
return 1;
if ((leftSide.IsPoolOrStandaloneHost && rightSide.IsPoolOrStandaloneHost) ||
(!leftSide.IsPoolOrStandaloneHost && !rightSide.IsPoolOrStandaloneHost))
{
return string.Compare(leftSide.Cells[leftSide.VersionCellIndex].Value.ToString(),
rightSide.Cells[rightSide.VersionCellIndex].Value.ToString(), true);
}
}
return 0;
}
}
private class PatchingHostsDataGridView : CollapsingPoolHostDataGridView
{
protected override void OnCellPainting(DataGridViewCellPaintingEventArgs e)
@ -742,6 +775,16 @@ namespace XenAdmin.Wizards.PatchingWizard
return CHECKED;
}
}
protected override void SortAdditionalColumns()
{
PatchingHostsDataGridViewRow firstRow = Rows[0] as PatchingHostsDataGridViewRow;
if (firstRow == null)
return;
if (columnToBeSortedIndex == firstRow.VersionCellIndex)
SortAndRebuildTree(new LocalVersionSorter(direction));
}
}
private class PatchingHostsDataGridViewRow : CollapsingPoolHostDataGridViewRow
@ -852,6 +895,11 @@ namespace XenAdmin.Wizards.PatchingWizard
SetupCells();
}
public int VersionCellIndex
{
get { return Cells.IndexOf(_versionCell); }
}
public override bool IsCheckable
{
get { return !HasPool; }