Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from MihaelaStoica/master

Browse Source 
CA-123013: Cloning from template shouldn't allow progress through the Ne...
This commit is contained in:
Gabor Apati-Nagy 2014-01-31 07:18:14 -08:00
commit e4867de422
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
XenAdmin/Controls/AffinityPicker.cs
View File

@ -49,6 +49,13 @@ namespace XenAdmin.Controls
private Host SrHost;
private Host Affinity;
/// <summary>
/// Should always be true if the AffinityPicker is used to create a VM.
/// If set to false (e.g. on Edit VM) and Affinity is null, then the "no home server" radio button remains enabled,
/// meaning that the VM already has no affinity and should not try to automatically select one.
/// </summary>
internal bool AutoSelectAffinity = true;
public event EventHandler SelectedAffinityChanged = new EventHandler(OnSelectedAffinityChanged);
private static void OnSelectedAffinityChanged(object obj, EventArgs e) { }
@ -96,7 +103,8 @@ namespace XenAdmin.Controls
return;
// Update enablement
DynamicRadioButton.Enabled = (Helpers.HasFullyConnectedSharedStorage(Connection) && SrHost == null) || Affinity == null;
DynamicRadioButton.Enabled = (Helpers.HasFullyConnectedSharedStorage(Connection) && SrHost == null) ||
(Affinity == null && !AutoSelectAffinity);
ServersGridView.Enabled = StaticRadioButton.Checked;
DynamicRadioButton.Text = Helpers.HasFullyConnectedSharedStorage(Connection)
? Messages.AFFINITY_PICKER_DYNAMIC_SHARED_SR

2
XenAdmin/SettingsPanels/HomeServerEditPage.cs
View File

@ -55,7 +55,7 @@ namespace XenAdmin.SettingsPanels
{
InitializeComponent();
Text = Messages.HOME_SERVER;
picker.AutoSelectAffinity = false;
}
#region IEditPage Members