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

CA-135560: Fix Creedence version number check and make WLB tab behaviour same for 6.5 and 6.1.

Browse Source 
Signed-off-by: Zheng Chai <zheng.chai@citrix.com>
This commit is contained in:
U-CITRITE\zhengc 2014-05-07 13:15:29 +08:00 committed by Zheng Chai
parent 011cc4ae17
commit 736a8d4cb4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;
}