Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-161460: Correct help text in the case that the patch has been deleted without being installed

Browse Source
This commit is contained in:
Stephen Turner 2015-02-24 13:42:48 +00:00
parent 3d7db537e7
commit 5990c53617
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
XenAdmin/Wizards/PatchingWizard/PatchingWizard_UploadPage.cs
View File

@ -381,7 +381,8 @@ namespace XenAdmin.Wizards.PatchingWizard
{ {
if (!canDownload) if (!canDownload)
{ {
var msg = string.Format(Messages.PATCH_DOWNLOAD_FAILED_MORE_INFO, SelectedExistingPatch.name_label, SelectedExistingPatch.Connection.Name); var msgtemplate = SelectedExistingPatch.host_patches.Count > 0 ? Messages.PATCH_DOWNLOAD_FAILED_MORE_INFO : Messages.PATCH_DOWNLOAD_FAILED_MORE_INFO_NOT_APPLIED;
var msg = string.Format(msgtemplate, SelectedExistingPatch.name_label, SelectedExistingPatch.Connection.Name);
new ThreeButtonDialog( new ThreeButtonDialog(
new ThreeButtonDialog.Details(SystemIcons.Error, msg)) new ThreeButtonDialog.Details(SystemIcons.Error, msg))
.ShowDialog(this); .ShowDialog(this);

13
XenModel/Messages.Designer.cs generated
View File

@ -24654,6 +24654,19 @@ namespace XenAdmin {
} }
} }
/// <summary>
/// Looks up a localized string similar to Failed to download the update {0} from &apos;{1}&apos;.
///
///The update has previously been uploaded to &apos;{1}&apos;, but the update installation file may have since been deleted.
///
///Upload the update from an .xsupdate file instead..
/// </summary>
public static string PATCH_DOWNLOAD_FAILED_MORE_INFO_NOT_APPLIED {
get {
return ResourceManager.GetString("PATCH_DOWNLOAD_FAILED_MORE_INFO_NOT_APPLIED", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to {0} /// Looks up a localized string similar to {0}
///Date modified: {1} ///Date modified: {1}

9
XenModel/Messages.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -12606,4 +12606,11 @@ You will need to navigate to the Console on each of the selected VMs to complete
<data name="YOU_ARE_HERE" xml:space="preserve"> <data name="YOU_ARE_HERE" xml:space="preserve">
<value>You are here</value> <value>You are here</value>
</data> </data>
<data name="PATCH_DOWNLOAD_FAILED_MORE_INFO_NOT_APPLIED" xml:space="preserve">
<value>Failed to download the update {0} from '{1}'.
The update has previously been uploaded to '{1}', but the update installation file may have since been deleted.
Upload the update from an .xsupdate file instead.</value>
</data>
</root> </root>