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-232944: Displaying server name as well

Browse Source 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2016-11-25 10:45:44 +00:00
parent c437d10bc8
commit 8160066d29
12 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Diagnostics/Problems/HostProblem/ConflictingUpdatePresent.cs
View File

@ -49,7 +49,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
{
get
{
return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE, confilctedUpdates);
return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE, ServerName, confilctedUpdates);
}
}

2
XenAdmin/Diagnostics/Problems/HostProblem/HostDoesNotHaveHotfix.cs
View File

@ -55,7 +55,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
public override string Description
{
get { return string.Format(Messages.REQUIRED_HOTFIX_ISNOT_INSTALLED, Server.Name); }
get { return string.Format(Messages.REQUIRED_HOTFIX_ISNOT_INSTALLED, ServerName); }
}
public override string HelpMessage

2
XenAdmin/Diagnostics/Problems/HostProblem/HostMaintenanceMode.cs
View File

@ -46,7 +46,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
public override string Description
{
get { return string.Format(Messages.UPDATES_WIZARD_HOST_MAINTENANCE_MODE,Server); }
get { return string.Format(Messages.UPDATES_WIZARD_HOST_MAINTENANCE_MODE, ServerName); }
}
protected override AsyncAction CreateAction(out bool cancelled)

2
XenAdmin/Diagnostics/Problems/HostProblem/HostNotLive.cs
View File

@ -47,7 +47,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
public override string Description
{
get { return string.Format(Messages.UPDATES_WIZARD_HOST_NOT_LIVE,Server); }
get { return string.Format(Messages.UPDATES_WIZARD_HOST_NOT_LIVE, ServerName); }
}
public override string HelpMessage

6
XenAdmin/Diagnostics/Problems/HostProblem/HostOutOfSpaceProblem.cs
View File

@ -89,13 +89,13 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
switch (diskSpaceReq.Operation)
{
case DiskSpaceRequirements.OperationTypes.install :
return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_INSTALL, Server.Name, name);
return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_INSTALL, ServerName, name);
case DiskSpaceRequirements.OperationTypes.upload :
return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_UPLOAD, Server.Name, name);
return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_UPLOAD, ServerName, name);
case DiskSpaceRequirements.OperationTypes.autoupdate :
return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_AUTO_UPDATE, Server.Name);
return string.Format(Messages.NOT_ENOUGH_SPACE_MESSAGE_AUTO_UPDATE, ServerName);
default:
Debug.Assert(false);

10
XenAdmin/Diagnostics/Problems/HostProblem/HostProblem.cs
View File

@ -47,6 +47,14 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
_server = server;
}
public string ServerName
{
get
{
return Helpers.GetName(_server).Ellipsise(30);
}
}
public Host Server
{
get
@ -57,7 +65,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
public sealed override string Title
{
get { return string.Format(Messages.PROBLEM_HOSTPROBLEM_TITLE, Helpers.GetName(Server).Ellipsise(30)); }
get { return string.Format(Messages.PROBLEM_HOSTPROBLEM_TITLE, ServerName); }
}

2
XenAdmin/Diagnostics/Problems/HostProblem/NotEnoughMem.cs
View File

@ -53,7 +53,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
public override string Description
{
get { return string.Format(Messages.UPDATES_WIZARD_NO_MEMORY, Server.Name); }
get { return string.Format(Messages.UPDATES_WIZARD_NO_MEMORY, ServerName); }
}
protected override AsyncAction CreateAction(out bool cancelled)

2
XenAdmin/Diagnostics/Problems/HostProblem/PrecheckFailed.cs
View File

@ -49,7 +49,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
public override string Description
{
get { return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED, _host, Failure.Message); }
get { return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED, ServerName, Failure.Message); }
}
public override string HelpMessage

2
XenAdmin/Diagnostics/Problems/HostProblem/PrerequisiteUpdateMissing.cs
View File

@ -50,7 +50,7 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
{
get
{
return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING, requiredUpdates);
return string.Format(Messages.UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING, Server, requiredUpdates);
}
}

4
XenAdmin/Diagnostics/Problems/HostProblem/WrongServerVersion.cs
View File

@ -56,10 +56,10 @@ namespace XenAdmin.Diagnostics.Problems.HostProblem
{
if (!string.IsNullOrEmpty(_versionRequired))
{
return string.Format(Messages.PATCH_FOR_XENSERVER_VERSION, _versionRequired);
return string.Format(Messages.PATCH_FOR_XENSERVER_VERSION, ServerName,_versionRequired);
}
return Messages.UPDATE_FOR_DIFFERENT_XENSERVER_VERSION;
return string.Format(Messages.UPDATE_FOR_DIFFERENT_XENSERVER_VERSION, ServerName);
}
}

8
XenModel/Messages.Designer.cs generated
View File

@ -26237,7 +26237,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to This patch is for servers with version matching the regular expression &apos;{0}&apos;..
/// Looks up a localized string similar to {0}: This patch is for servers with version matching the regular expression &apos;{1}&apos;..
/// </summary>
public static string PATCH_FOR_XENSERVER_VERSION {
get {
@ -33112,7 +33112,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to This update is not compatible with this server version..
/// Looks up a localized string similar to {0}: This update is not compatible with this server version..
/// </summary>
public static string UPDATE_FOR_DIFFERENT_XENSERVER_VERSION {
get {
@ -33864,7 +33864,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Conflicting update(s) are present: {0}.
/// Looks up a localized string similar to {0}: Conflicting update(s) are present: {1}.
/// </summary>
public static string UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE {
get {
@ -33882,7 +33882,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Prerequisite update(s) are missing: {0}.
/// Looks up a localized string similar to {0}: Prerequisite update(s) are missing: {1}.
/// </summary>
public static string UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING {
get {

8
XenModel/Messages.resx
View File

@ -9398,7 +9398,7 @@ Date created: {2}
Size: {3}</value>
</data>
<data name="PATCH_FOR_XENSERVER_VERSION" xml:space="preserve">
<value>This patch is for servers with version matching the regular expression '{0}'.</value>
<value>{0}: This patch is for servers with version matching the regular expression '{1}'.</value>
</data>
<data name="PATCH_NOT_FOUND" xml:space="preserve">
<value>Not found</value>
@ -11695,13 +11695,13 @@ Check your settings and try again.</value>
<value>{0}: {1}</value>
</data>
<data name="UPDATES_WIZARD_PRECHECK_FAILED_CONFLICTING_UPDATE" xml:space="preserve">
<value>Conflicting update(s) are present: {0}</value>
<value>{0}: Conflicting update(s) are present: {1}</value>
</data>
<data name="UPDATES_WIZARD_PRECHECK_FAILED_ON_ALL_SERVERS" xml:space="preserve">
<value>Pre-update checks failed on the selected servers. The update will not be applied.</value>
</data>
<data name="UPDATES_WIZARD_PRECHECK_FAILED_REQUIRED_UPDATE_MISSING" xml:space="preserve">
<value>Prerequisite update(s) are missing: {0}</value>
<value>{0}: Prerequisite update(s) are missing: {1}</value>
</data>
<data name="UPDATES_WIZARD_PRECHECK_FAILED_TITLE" xml:space="preserve">
<value>Update precheck failed on server '{0}'</value>
@ -11787,7 +11787,7 @@ Note that if RBAC is enabled, only updates which you have privileges to dismiss
<value>You have applied filters to the list of updates. Do you wish to export all updates from every connected server, or only the updates you have chosen to view?</value>
</data>
<data name="UPDATE_FOR_DIFFERENT_XENSERVER_VERSION" xml:space="preserve">
<value>This update is not compatible with this server version.</value>
<value>{0}: This update is not compatible with this server version.</value>
</data>
<data name="UPDATE_MANAGER_CANNOT_REMOVE_APPLIED_PATCH" xml:space="preserve">
<value>Cannot remove an update which is applied to any servers.</value>