Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-264439: Change the XenCenter version check to return just a warning in the RPU wizard

Browse Source 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2017-08-31 09:51:20 +01:00
parent 69007dbaec
commit 6a2f77c9f6
4 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
XenAdmin/Diagnostics/Checks/XenCenterVersionCheck.cs
View File

@ -51,9 +51,12 @@ namespace XenAdmin.Diagnostics.Checks
protected override Problem RunCheck()
{
var requiredXenCenterVersion = Updates.GetRequiredXenCenterVersion(_newServerVersion);
if (requiredXenCenterVersion != null)
if (requiredXenCenterVersion == null)
return null;
if (_newServerVersion != null)
return new XenCenterVersionProblem(this, requiredXenCenterVersion);
return null;
else
return new XenCenterVersionWarning(this, requiredXenCenterVersion);
}
public override string Description

36
XenAdmin/Diagnostics/Problems/XenCenterVersionProblem.cs
View File

@ -70,4 +70,40 @@ namespace XenAdmin.Diagnostics.Problems
get { return new Uri(_requiredXenCenterVersion.Url); }
}
}
public class XenCenterVersionWarning : WarningWithInformationUrl
{
private XenCenterVersion _requiredXenCenterVersion;
public XenCenterVersionWarning(Check check, XenCenterVersion requiredXenCenterVersion)
: base(check)
{
_requiredXenCenterVersion = requiredXenCenterVersion;
}
public override string Title
{
get { return Messages.PROBLEM_XENCENTER_VERSION_TITLE; }
}
public override string Description
{
get { return string.Format(Messages.UPDATES_WIZARD_NEWER_XENCENTER_WARNING, _requiredXenCenterVersion.Version); }
}
public override string HelpMessage
{
get { return LinkText; }
}
public override string LinkText
{
get { return Messages.PATCHING_WIZARD_WEBPAGE_CELL; }
}
public override Uri UriToLaunch
{
get { return new Uri(_requiredXenCenterVersion.Url); }
}
}
}

9
XenModel/Messages.Designer.cs generated
View File

@ -33765,6 +33765,15 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to Ensure you have upgraded [XenCenter] before upgrading [XenServer]..
/// </summary>
public static string UPDATES_WIZARD_NEWER_XENCENTER_WARNING {
get {
return ResourceManager.GetString("UPDATES_WIZARD_NEWER_XENCENTER_WARNING", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to No further action is required for this update..
/// </summary>

3
XenModel/Messages.resx
View File

@ -11655,6 +11655,9 @@ Check your settings and try again.</value>
<data name="UPDATES_WIZARD_NEWER_XENCENTER_REQUIRED" xml:space="preserve">
<value>[XenCenter] version {0} or newer is required.</value>
</data>
<data name="UPDATES_WIZARD_NEWER_XENCENTER_WARNING" xml:space="preserve">
<value>Ensure you have upgraded [XenCenter] before upgrading [XenServer].</value>
</data>
<data name="UPDATES_WIZARD_NOTVALID_EXTENSION" xml:space="preserve">
<value>The selected file does not have a valid extension. Valid extensions are: *.{0} and *.iso</value>
</data>