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

Do not change the page top blurb depending on the process outcome. Improved error messages.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2018-06-08 16:15:55 +01:00
parent 2e2ae7c196
commit 73e7b66fa4
3 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
XenAdmin/Wizards/PatchingWizard/PatchingWizard_AutomatedUpdatesPage.cs
View File

@ -329,16 +329,20 @@ namespace XenAdmin.Wizards.PatchingWizard
} }
} }
if (bgwErrorCount > 0)
{
sb.AppendLine(); sb.AppendLine();
if (bgwErrorCount > 0)
{
sb.AppendLine(bgwErrorCount > 1 sb.AppendLine(bgwErrorCount > 1
? Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURRED ? Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_POOL_MANY
: Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURRED); : Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_POOL_ONE);
sb.Append(errorSb); sb.Append(errorSb);
} }
else
{
sb.AppendLine(Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_ONE);
}
sb.AppendLine(); sb.AppendLine();
allsb.Append(sb); allsb.Append(sb);
@ -514,8 +518,9 @@ namespace XenAdmin.Wizards.PatchingWizard
var bgw = sender as UpdateProgressBackgroundWorker; var bgw = sender as UpdateProgressBackgroundWorker;
if (bgw != null && bgw.DoneActions.Any(a => a.Error != null)) if (bgw != null && bgw.DoneActions.Any(a => a.Error != null))
{ {
labelTitle.Text = Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_FAILED; labelError.Text = backgroundWorkers.Count > 1
labelError.Text = Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR; ? Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_MANY
: Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_ONE;
pictureBox1.Image = Images.StaticImages._000_error_h32bit_16; pictureBox1.Image = Images.StaticImages._000_error_h32bit_16;
panel1.Visible = true; panel1.Visible = true;
} }
@ -526,12 +531,9 @@ namespace XenAdmin.Wizards.PatchingWizard
{ {
if (!panel1.Visible) if (!panel1.Visible)
{ {
if (WizardMode == WizardMode.AutomatedUpdates) labelError.Text = backgroundWorkers.Count > 1
labelTitle.Text = Messages.PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE; ? Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_MANY
else if (WizardMode == WizardMode.NewVersion) : Messages.PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_ONE;
labelTitle.Text = Messages.PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE;
labelError.Text = Messages.CLOSE_WIZARD_CLICK_FINISH;
pictureBox1.Image = Images.StaticImages._000_Tick_h32bit_16; pictureBox1.Image = Images.StaticImages._000_Tick_h32bit_16;
panel1.Visible = true; panel1.Visible = true;
} }

62
XenModel/Messages.Designer.cs generated
View File

@ -27086,38 +27086,38 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to The automated updates process was not completed successfully.. /// Looks up a localized string similar to One or more of the automated update processes were not completed successfully..
/// </summary> /// </summary>
public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR { public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_MANY {
get { get {
return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR", resourceCulture); return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_MANY", resourceCulture);
} }
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to The following error occurred while automated updates were in progress:. /// Looks up a localized string similar to The automated update process was not completed successfuly..
/// </summary> /// </summary>
public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURRED { public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_ONE {
get { get {
return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURRED", resourceCulture); return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_ONE", resourceCulture);
} }
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to The following errors occurred while automated updates were in progress:. /// Looks up a localized string similar to The following errors occurred while automated updates were in progress:.
/// </summary> /// </summary>
public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURRED { public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_POOL_MANY {
get { get {
return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURRED", resourceCulture); return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_POOL_MANY", resourceCulture);
} }
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to The update was not completed successfully. /// Looks up a localized string similar to The following error occurred while automated updates were in progress:.
/// </summary> /// </summary>
public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_FAILED { public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_POOL_ONE {
get { get {
return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_FAILED", resourceCulture); return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_POOL_ONE", resourceCulture);
} }
} }
@ -27130,6 +27130,24 @@ namespace XenAdmin {
} }
} }
/// <summary>
/// Looks up a localized string similar to All automated update processes were completed successfuly..
/// </summary>
public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_MANY {
get {
return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_MANY", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to The automated update process was completed successfuly..
/// </summary>
public static string PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_ONE {
get {
return ResourceManager.GetString("PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_ONE", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Upload and Install. /// Looks up a localized string similar to Upload and Install.
/// </summary> /// </summary>
@ -27730,25 +27748,7 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to The new version has been installed.. /// Looks up a localized string similar to [XenCenter] is now installing updates on your system..
/// </summary>
public static string PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Automated updates have finished..
/// </summary>
public static string PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE {
get {
return ResourceManager.GetString("PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Installing updates:.
/// </summary> /// </summary>
public static string PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE { public static string PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE {
get { get {
@ -27757,7 +27757,7 @@ namespace XenAdmin {
} }
/// <summary> /// <summary>
/// Looks up a localized string similar to Installing new version:. /// Looks up a localized string similar to [XenCenter] is now installing the new version on your system..
/// </summary> /// </summary>
public static string PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE { public static string PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE {
get { get {

30
XenModel/Messages.resx
View File

@ -9342,21 +9342,27 @@ However, there is not enough space to perform the repartitioning, so the current
<data name="PASTE" xml:space="preserve"> <data name="PASTE" xml:space="preserve">
<value>Paste</value> <value>Paste</value>
</data> </data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_MANY" xml:space="preserve">
<value>The automated updates process was not completed successfully.</value> <value>One or more of the automated updates processes were not completed successfully.</value>
</data> </data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERRORS_OCCURRED" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_ONE" xml:space="preserve">
<value>The automated updates process was not completed successfuly.</value>
</data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_POOL_MANY" xml:space="preserve">
<value>The following errors occurred while automated updates were in progress:</value> <value>The following errors occurred while automated updates were in progress:</value>
</data> </data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_OCCURRED" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_ERROR_POOL_ONE" xml:space="preserve">
<value>The following error occurred while automated updates were in progress:</value> <value>The following error occurred while automated updates were in progress:</value>
</data> </data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_FAILED" xml:space="preserve">
<value>The update was not completed successfully</value>
</data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_IN_PROGRESS_DOTDOTDOT" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_IN_PROGRESS_DOTDOTDOT" xml:space="preserve">
<value>{0}...</value> <value>{0}...</value>
</data> </data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_MANY" xml:space="preserve">
<value>All automated updates processes were completed successfuly.</value>
</data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_SUCCESS_ONE" xml:space="preserve">
<value>The automated updates process was completed successfuly.</value>
</data>
<data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_TEXT" xml:space="preserve"> <data name="PATCHINGWIZARD_AUTOUPDATINGPAGE_TEXT" xml:space="preserve">
<value>Upload and Install</value> <value>Upload and Install</value>
</data> </data>
@ -9559,12 +9565,6 @@ Servers where this update cannot be applied appear disabled in this list.</value
<data name="PATCHINGWIZARD_SELECTSERVERPAGE_TITLE" xml:space="preserve"> <data name="PATCHINGWIZARD_SELECTSERVERPAGE_TITLE" xml:space="preserve">
<value>Select the servers you want to update</value> <value>Select the servers you want to update</value>
</data> </data>
<data name="PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_NEW_VERSION_MODE" xml:space="preserve">
<value>The new version has been installed.</value>
</data>
<data name="PATCHINGWIZARD_UPDATES_DONE_AUTOMATED_UPDATES_MODE" xml:space="preserve">
<value>Automated updates have finished.</value>
</data>
<data name="PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD" xml:space="preserve"> <data name="PATCHINGWIZARD_UPLOADPAGE_MESSAGE_DOWNLOAD_AND_UPLOAD" xml:space="preserve">
<value>[XenCenter] is now downloading your update and uploading it to the servers specified in the previous step. <value>[XenCenter] is now downloading your update and uploading it to the servers specified in the previous step.
Please wait for these operations to complete, then click Next to continue with the installation.</value> Please wait for these operations to complete, then click Next to continue with the installation.</value>
@ -9583,10 +9583,10 @@ Please wait for this operation to complete, then click Next to continue with the
<value>Uploading the selected file to your servers</value> <value>Uploading the selected file to your servers</value>
</data> </data>
<data name="PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE" xml:space="preserve"> <data name="PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_AUTOMATED_MODE" xml:space="preserve">
<value>Installing updates:</value> <value>[XenCenter] is now installing updates on your system.</value>
</data> </data>
<data name="PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE" xml:space="preserve"> <data name="PATCHINGWIZARD_UPLOAD_AND_INSTALL_TITLE_NEW_VERSION_AUTOMATED_MODE" xml:space="preserve">
<value>Installing new version:</value> <value>[XenCenter] is now installing the new version on your system.</value>
</data> </data>
<data name="PATCHING_EJECT_CDS" xml:space="preserve"> <data name="PATCHING_EJECT_CDS" xml:space="preserve">
<value>Eject any virtual CDs from your VMs</value> <value>Eject any virtual CDs from your VMs</value>