Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

The users TabPage should not appear for hosts in a pool, only standalone hosts or pool. Corrected message.

Browse Source 
Signed-off-by: Konstantina Chremmou <Konstantina.Chremmou@cloud.com>
This commit is contained in:
Konstantina Chremmou 2023-08-04 14:00:57 +01:00
parent fc868f5a5f
commit 538dc61c94
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/MainWindow.cs
View File

@ -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)

4
XenModel/Messages.Designer.cs generated
View File

@ -28059,7 +28059,7 @@ namespace XenAdmin {
}
/// <summary>
/// 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..
/// </summary>
public static string NO_GPU_IN_POOL {
get {
@ -28068,7 +28068,7 @@ namespace XenAdmin {
}
/// <summary>
/// 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..
/// </summary>
public static string NO_GPU_ON_HOST {
get {

4
XenModel/Messages.resx
View File

@ -9751,10 +9751,10 @@ When you configure an NFS storage repository, you simply provide the host name o
<value>There is no server eligible to become the coordinator of your new pool</value>
</data>
<data name="NO_GPU_IN_POOL" xml:space="preserve">
<value>GPU configuration and monitoring is disabled, because there are no GPUs available in this pool.</value>
<value>GPU configuration and monitoring are disabled, because there are no GPUs available in this pool.</value>
</data>
<data name="NO_GPU_ON_HOST" xml:space="preserve">
<value>GPU configuration and monitoring is disabled, because there are no GPUs available on this host.</value>
<value>GPU configuration and monitoring are disabled, because there are no GPUs available on this host.</value>
</data>
<data name="NO_HALTED_VMS" xml:space="preserve">
<value>There are no halted or suspended VMs to export</value>