CA-294901: Reworked rubric for home server assignment because previous work on it broke the template case.

Also, no need to use a different message for single and multiple VMs or templates.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2021-09-11 01:04:24 +01:00
parent 44c9416745
commit 1936b74030
3 changed files with 9 additions and 9 deletions

View File

@ -129,8 +129,8 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard
protected override string TargetServerText => Messages.CPM_WIZARD_DESTINATION_DESTINATION;
protected override string TargetServerSelectionIntroText =>
selectedVMs != null && selectedVMs.Count == 1
? Messages.CPM_WIZARD_DESTINATION_TABLE_INTRO_SINGLE
TemplatesOnly
? Messages.CPM_WIZARD_DESTINATION_TABLE_INTRO_TEMPLATES
: Messages.CPM_WIZARD_DESTINATION_TABLE_INTRO;
protected override DelayLoadingOptionComboBoxItem CreateDelayLoadingOptionComboBoxItem(IXenObject xenItem)

View File

@ -10682,7 +10682,7 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Optionally, assign the VMs a &amp;home server in the destination pool:.
/// Looks up a localized string similar to Optionally, assign the VM(s) a &amp;home server in the destination pool:.
/// </summary>
public static string CPM_WIZARD_DESTINATION_TABLE_INTRO {
get {
@ -10691,11 +10691,11 @@ namespace XenAdmin {
}
/// <summary>
/// Looks up a localized string similar to Optionally, assign the VM a &amp;home server in the destination pool:.
/// Looks up a localized string similar to Optionally, assign the template(s) a &amp;home server in the destination pool:.
/// </summary>
public static string CPM_WIZARD_DESTINATION_TABLE_INTRO_SINGLE {
public static string CPM_WIZARD_DESTINATION_TABLE_INTRO_TEMPLATES {
get {
return ResourceManager.GetString("CPM_WIZARD_DESTINATION_TABLE_INTRO_SINGLE", resourceCulture);
return ResourceManager.GetString("CPM_WIZARD_DESTINATION_TABLE_INTRO_TEMPLATES", resourceCulture);
}
}

View File

@ -3809,10 +3809,10 @@ This action cannot be undone. Are you sure you want to continue?</value>
<value>Select the pool or standalone server where you want to move the selected VM to.</value>
</data>
<data name="CPM_WIZARD_DESTINATION_TABLE_INTRO" xml:space="preserve">
<value>Optionally, assign the VMs a &amp;home server in the destination pool:</value>
<value>Optionally, assign the VM(s) a &amp;home server in the destination pool:</value>
</data>
<data name="CPM_WIZARD_DESTINATION_TABLE_INTRO_SINGLE" xml:space="preserve">
<value>Optionally, assign the VM a &amp;home server in the destination pool:</value>
<data name="CPM_WIZARD_DESTINATION_TABLE_INTRO_TEMPLATES" xml:space="preserve">
<value>Optionally, assign the template(s) a &amp;home server in the destination pool:</value>
</data>
<data name="CPM_WIZARD_DESTINATION_TAB_TITLE" xml:space="preserve">
<value>Destination Pool</value>