Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-107917: XOP-373: When rolling out a XD desktop group, SR storage tab becomes unusuable in XC.

Browse Source 
Modified BuildList() method to remove and add dataGridViewRows only when needed (previously all rows were cleared and new rows were added every time BuildList method was executed).

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
This commit is contained in:
Adrian Jachacy 2013-07-15 13:27:47 +01:00
parent d4fdf02111
commit 0927fd02c8
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
XenAdmin/TabPages/SrStoragePage.cs
View File

@ -33,10 +33,7 @@ using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading;
using System.Windows.Forms;
using XenAdmin.Controls;
@ -44,12 +41,9 @@ using XenAdmin.Core;
using XenAdmin.Actions;
using XenAPI;
using System.Drawing.Text;
using XenAdmin.Dialogs;
using XenAdmin.Network.StorageLink;
using XenAdmin.Commands;
namespace XenAdmin.TabPages
{
internal partial class SrStoragePage : BaseTabPage
@ -80,7 +74,6 @@ namespace XenAdmin.TabPages
base.Text = Messages.VIRTUAL_DISKS;
Properties.Settings.Default.PropertyChanged += Default_PropertyChanged;
}
private void SetupDeprecationBanner()
@ -136,39 +129,41 @@ namespace XenAdmin.TabPages
private void BuildList()
{
//Save the selection
DataGridViewSelectedRowCollection selectedItems = dataGridViewVDIs.SelectedRows;
int firstrowDisplayed = dataGridViewVDIs.FirstDisplayedScrollingRowIndex;
dataGridViewVDIs.SuspendLayout();
try
{
dataGridViewVDIs.Rows.Clear();
if (sr == null)
return;
List<VDI> vdis = sr.Connection.ResolveAll(sr.VDIs);
List<VDI> vdis =
sr.Connection.ResolveAll(sr.VDIs).Where(
vdi =>
vdi.Show(Properties.Settings.Default.ShowHiddenVMs && !vdi.IsAnIntermediateStorageMotionSnapshot))
.ToList();
List<VDIRow> vdisToRemove =
dataGridViewVDIs.Rows.OfType<VDIRow>().Where(vdiRow => !vdis.Contains(vdiRow.VDI)).OrderByDescending(row => row.Index).ToList();
foreach (var vdiRow in vdisToRemove)
{
dataGridViewVDIs.Rows.RemoveAt(vdiRow.Index);
}
storageLinkVolumeColumn.Visible = vdis.Find(v => v.sm_config.ContainsKey("SVID")) != null;
foreach (VDI vdi in vdis)
{
if (!vdi.Show(Properties.Settings.Default.ShowHiddenVMs))
continue;
if (vdi.IsAnIntermediateStorageMotionSnapshot)
VDI vdi1 = vdi;
VDIRow vdiRow = dataGridViewVDIs.Rows.OfType<VDIRow>().FirstOrDefault(row => row.VDI.Equals(vdi1));
if (vdiRow != null)
{
vdiRow.UpdateRowDetails(vdi, storageLinkVolumeColumn.Visible);
continue;
}
VDIRow newRow = new VDIRow(vdi, storageLinkVolumeColumn.Visible);
dataGridViewVDIs.Rows.Add(newRow);
}
IEnumerable<VDI> selectedVDIs = from VDIRow row in selectedItems select row.VDI;
foreach (VDIRow row in dataGridViewVDIs.Rows)
{
row.Selected = selectedVDIs.Contains(row.VDI);
}
}
finally
{
@ -178,8 +173,7 @@ namespace XenAdmin.TabPages
dataGridViewVDIs.ResumeLayout();
}
if (dataGridViewVDIs.Rows.Count > 0)
dataGridViewVDIs.FirstDisplayedScrollingRowIndex = (firstrowDisplayed < 0 || firstrowDisplayed >= dataGridViewVDIs.Rows.Count) ? 0 : firstrowDisplayed;
RefreshButtons();
}
@ -191,7 +185,8 @@ namespace XenAdmin.TabPages
foreach (DataGridViewRow r in dataGridViewVDIs.SelectedRows)
{
VDIRow row = r as VDIRow;
vdis.Add(new SelectedItem(row.VDI));
if (row != null)
vdis.Add(new SelectedItem(row.VDI));
}
return new SelectedItemCollection(vdis);
}
@ -492,7 +487,7 @@ namespace XenAdmin.TabPages
public class VDIRow : DataGridViewRow
{
public VDI VDI;
public VDI VDI { get; private set; }
private bool showStorageLink = false;
@ -535,6 +530,17 @@ namespace XenAdmin.TabPages
return "";
}
}
public void UpdateRowDetails(VDI vdi, bool showSL)
{
VDI = vdi;
showStorageLink = showSL;
for (int i = 0; i < 5; i++)
{
Cells[i].Value = GetCellText(i);
}
}
}
private void dataGridViewVDIs_CellMouseUp(object sender, DataGridViewCellMouseEventArgs e)