Merge pull request #99 from MihaelaStoica/CA-115742

CA-115742: VM name and description change not allowed via XenCenter for ...
This commit is contained in:
Stephen Turner 2014-07-01 11:35:25 +01:00
commit 4292169435
3 changed files with 9 additions and 15 deletions

View File

@ -130,11 +130,7 @@ namespace XenAdmin.SettingsPanels
public bool HasChanged
{
get
{
return ShadowValue != vm.HVM_shadow_multiplier
|| ShadowMultiplierTextBox.Text != vm.HVM_shadow_multiplier.ToString();
}
get { return ShadowValue != vm.HVM_shadow_multiplier; }
}
private double ShadowValue
@ -142,21 +138,19 @@ namespace XenAdmin.SettingsPanels
get
{
double v;
return double.TryParse(ShadowMultiplierTextBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out v)
? v
: SHADOW_MULTIPLIER_GENERAL_USE;
return double.TryParse(ShadowMultiplierTextBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out v)
? v
: -1;
}
set
{
ShadowMultiplierTextBox.Text = value.ToString("N", CultureInfo.InvariantCulture);
ShadowMultiplierTextBox.Text = value.ToString(CultureInfo.InvariantCulture);
}
}
public void ShowLocalValidationMessages()
{
double v;
if (!(double.TryParse(ShadowMultiplierTextBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out v)
&& v > 0.1))
if (!ValidToSave)
{
HelpersGUI.ShowBalloonMessage(ShadowMultiplierTextBox,
Messages.SHADOW_MEMORY_MULTIPLIER_VALUE,
@ -176,7 +170,7 @@ namespace XenAdmin.SettingsPanels
{
double v;
return double.TryParse(ShadowMultiplierTextBox.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out v)
&& v > 0.1;
&& v >= 1.0;
}
}

View File

@ -27598,7 +27598,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Value should be a number greater than 0.1.
/// Looks up a localized string similar to Value should be a number greater than or equal to 1.0.
/// </summary>
public static string SHADOW_MEMORY_MULTIPLIER_VALUE {
get {

View File

@ -9590,7 +9590,7 @@ Upgrading VMs using StorageLink Gateway to XenServer 6.0 is only supported if th
<value>Shadow memory multiplier: {0}</value>
</data>
<data name="SHADOW_MEMORY_MULTIPLIER_VALUE" xml:space="preserve">
<value>Value should be a number greater than 0.1</value>
<value>Value should be a number greater than or equal to 1.0</value>
</data>
<data name="SHARED" xml:space="preserve">
<value>Shared</value>