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

Merge pull request #63 from Zhengchai/cp-7527

Browse Source 
CA-135560: Fix Creedence Platform version number check and WLB tab display problem
This commit is contained in:
Gabor Apati-Nagy 2014-05-14 11:20:26 +01:00
commit d3fb355c4e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
XenAdmin/Controls/NetworkingTab/NetworkList.cs
View File

@ -341,7 +341,8 @@ namespace XenAdmin.Controls.NetworkingTab
List<NetworkRow> networkRowsToAdd = new List<NetworkRow>();
for (int i = 0; i < networks.Length; i++)
{
if (!networks[i].Show(XenAdmin.Properties.Settings.Default.ShowHiddenVMs))
if (!networks[i].Show(XenAdmin.Properties.Settings.Default.ShowHiddenVMs) ||
Helpers.FindPIF(networks[i], XenObject as Host) == null)
continue;
networkRowsToAdd.Add(new NetworkRow(networks[i], XenObject));
}

5
XenAdmin/MainWindow.cs
View File

@ -1322,9 +1322,8 @@ namespace XenAdmin
ShowTab(ha_upsell ? TabPageHAUpsell : TabPageHA, !multi && !SearchMode && isPoolSelected && has_ha_license_flag);
ShowTab(TabPageSnapshots, !multi && !SearchMode && george_or_greater && isRealVMSelected);
//Any Clearwater XenServer, or an unlicensed >=Creedence XenServer, the WLB tab and any WLB menu items disappear completely.
if(!(SelectionManager.Selection.All(s => Helpers.IsClearwater(s.Connection)) ||
(wlb_upsell && SelectionManager.Selection.All(s => Helpers.CreedenceOrGreater(s.Connection)))))
//Any Clearwater XenServer, or WLB is not licensed on XenServer, the WLB tab and any WLB menu items disappear completely.
if(!(SelectionManager.Selection.All(s => Helpers.IsClearwater(s.Connection)) || wlb_upsell ))
ShowTab(TabPageWLB, !multi && !SearchMode && isPoolSelected && george_or_greater);
ShowTab(TabPageAD, !multi && !SearchMode && (isPoolSelected || isHostSelected && isHostLive) && george_or_greater);

2
XenModel/Utils/Helpers.cs
View File

@ -434,7 +434,7 @@ namespace XenAdmin.Core
string platform_version = HostPlatformVersion(host);
return
platform_version != null && productVersionCompare(platform_version, "1.8.900") >= 0 ||
platform_version != null && productVersionCompare(platform_version, "1.8.90") >= 0 ||
HostBuildNumber(host) == CUSTOM_BUILD_NUMBER;
}