Merge pull request #1103 from geosharath/VMSS

CA-213500: Revert To, Actions and Delete buttons are enabled even if there is no manual snapshot.
This commit is contained in:
Mihaela Stoica 2016-08-12 13:47:25 +01:00 committed by GitHub
commit 504492d741

View File

@ -1115,7 +1115,11 @@ namespace XenAdmin.TabPages
{
VM snap = (VM)item.Tag;
if (snap != null && snap.is_a_snapshot)
snapshots.Add(snap);
{
if(!(snap.is_snapshot_from_vmpp || snap.is_vmss_snapshot) || toolStripMenuItemScheduledSnapshots.Checked)
snapshots.Add(snap);
}
}
return snapshots;
}
@ -1129,7 +1133,10 @@ namespace XenAdmin.TabPages
{
VM snap = (VM)row.Tag;
if (snap != null && snap.is_a_snapshot)
snapshots.Add(snap);
{
if (!(snap.is_snapshot_from_vmpp || snap.is_vmss_snapshot) || toolStripMenuItemScheduledSnapshots.Checked)
snapshots.Add(snap);
}
}
return snapshots;
}