Merge pull request #1079 from geosharath/VMSS

CA-213499: List view of snapshots not working as expected with VMSS
This commit is contained in:
Mihaela Stoica 2016-07-29 09:26:49 +01:00 committed by GitHub
commit 40b2b5fc4d

View File

@ -426,16 +426,7 @@ namespace XenAdmin.TabPages
for (int i = 0; i < snapshots.Count; i++) for (int i = 0; i < snapshots.Count; i++)
{ {
VM snapshot = snapshots[i]; VM snapshot = snapshots[i];
if (!(snapshot.is_snapshot_from_vmpp && !toolStripMenuItemScheduledSnapshots.Checked)) if (!(snapshot.is_snapshot_from_vmpp || snapshot.is_vmss_snapshot) || toolStripMenuItemScheduledSnapshots.Checked)
{
snapshot.PropertyChanged -= snapshot_PropertyChanged;
snapshot.PropertyChanged += snapshot_PropertyChanged;
//Build DataGridView
SnapshotDataGridViewRow row = new SnapshotDataGridViewRow(snapshot);
row.Tag = snapshot;
DataGridView.Rows.Add(row);
}
else if (!(snapshot.is_vmss_snapshot && !toolStripMenuItemScheduledSnapshots.Checked))
{ {
snapshot.PropertyChanged -= snapshot_PropertyChanged; snapshot.PropertyChanged -= snapshot_PropertyChanged;
snapshot.PropertyChanged += snapshot_PropertyChanged; snapshot.PropertyChanged += snapshot_PropertyChanged;
@ -444,6 +435,7 @@ namespace XenAdmin.TabPages
row.Tag = snapshot; row.Tag = snapshot;
DataGridView.Rows.Add(row); DataGridView.Rows.Add(row);
} }
VM parent = VM.Connection.Resolve<VM>(snapshot.parent); VM parent = VM.Connection.Resolve<VM>(snapshot.parent);
if (parent == null) if (parent == null)
roots.Add(snapshot); roots.Add(snapshot);