Merge pull request #401 from stephen-turner/CA-151447

CA-151447 & CA-165108
This commit is contained in:
Gabor Apati-Nagy 2015-03-23 12:49:46 +00:00
commit aaffa34be2
2 changed files with 3 additions and 3 deletions

View File

@ -75,7 +75,7 @@ namespace XenAdmin.SettingsPanels
if (_host == null)
return "";
return HostPowerOnMode == PowerOnMode.Disabled ? Messages.NONE : _host.power_on_mode;
return PoolPowerONEditPage.GetFullNameMode(_host.power_on_mode);
}
}
@ -229,7 +229,7 @@ namespace XenAdmin.SettingsPanels
string newMode, ip, user, password;
Dictionary<string, string> customConfig;
GetConfig(out newMode, out ip, out user, out password, out customConfig);
if (HostPowerOnMode != NewPowerOnMode)
if (_host.power_on_mode != newMode)
return true;
if (!Helper.AreEqual(_host.power_on_config, customConfig))
return true;

View File

@ -103,7 +103,7 @@ namespace XenAdmin.SettingsPanels
}
}
private string GetFullNameMode(string power_on_mode)
public static string GetFullNameMode(string power_on_mode)
{
switch (power_on_mode)
{