From 538dc61c941db41760b72d220ff131db46e9fdd7 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Fri, 4 Aug 2023 14:00:57 +0100 Subject: [PATCH] The users TabPage should not appear for hosts in a pool, only standalone hosts or pool. Corrected message. Signed-off-by: Konstantina Chremmou --- XenAdmin/MainWindow.cs | 4 ++-- XenModel/Messages.Designer.cs | 4 ++-- XenModel/Messages.resx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs index db59433dd..e7edcc3c1 100755 --- a/XenAdmin/MainWindow.cs +++ b/XenAdmin/MainWindow.cs @@ -1434,7 +1434,7 @@ namespace XenAdmin // empty (i.e. at startup). bool show_home = SelectionManager.Selection.Count == 1 && SelectionManager.Selection[0].Value == null; // The upsell pages use the first selected XenObject: but they're only shown if there is only one selected object (see calls to ShowTab() below). - bool ha_upsell = Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictHA) && (selectionPool != null && !selectionPool.ha_enabled); + bool ha_upsell = Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictHA) && selectionPool != null && !selectionPool.ha_enabled; bool wlb_upsell = Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictWLB); bool ad_upsell = Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictAD); bool is_connected = selectionConnection != null && selectionConnection.IsConnected; @@ -1527,7 +1527,7 @@ namespace XenAdmin if (!wlb_upsell && !multi && !SearchMode && isPoolSelected) newTabs.Add(TabPageWLB); - if (!multi && !SearchMode && (isPoolSelected || isHostSelected && isHostLive)) + if (!multi && !SearchMode && (isPoolSelected || isPoolOrLiveStandaloneHost)) newTabs.Add(ad_upsell ? TabPageADUpsell : TabPageAD); if (!multi && !SearchMode && isPoolOrLiveStandaloneHost && !Helpers.FeatureForbidden(SelectionManager.Selection.FirstAsXenObject, Host.RestrictPvsCache) diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 8bf148749..d73e978e1 100755 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -28059,7 +28059,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to GPU configuration and monitoring is disabled, because there are no GPUs available in this pool.. + /// Looks up a localized string similar to GPU configuration and monitoring are disabled, because there are no GPUs available in this pool.. /// public static string NO_GPU_IN_POOL { get { @@ -28068,7 +28068,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to GPU configuration and monitoring is disabled, because there are no GPUs available on this host.. + /// Looks up a localized string similar to GPU configuration and monitoring are disabled, because there are no GPUs available on this host.. /// public static string NO_GPU_ON_HOST { get { diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index b536f5e37..13e3b05d2 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -9751,10 +9751,10 @@ When you configure an NFS storage repository, you simply provide the host name o There is no server eligible to become the coordinator of your new pool - GPU configuration and monitoring is disabled, because there are no GPUs available in this pool. + GPU configuration and monitoring are disabled, because there are no GPUs available in this pool. - GPU configuration and monitoring is disabled, because there are no GPUs available on this host. + GPU configuration and monitoring are disabled, because there are no GPUs available on this host. There are no halted or suspended VMs to export