From 736a8d4cb419a6dead3cef8d994f29e2e89e9b9c Mon Sep 17 00:00:00 2001 From: "U-CITRITE\\zhengc" Date: Wed, 7 May 2014 13:15:29 +0800 Subject: [PATCH] CA-135560: Fix Creedence version number check and make WLB tab behaviour same for 6.5 and 6.1. Signed-off-by: Zheng Chai --- XenAdmin/MainWindow.cs | 5 ++--- XenModel/Utils/Helpers.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs index 9bb140e3f..8c0c8415b 100644 --- a/XenAdmin/MainWindow.cs +++ b/XenAdmin/MainWindow.cs @@ -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); diff --git a/XenModel/Utils/Helpers.cs b/XenModel/Utils/Helpers.cs index 23521a2d7..bdd6ef2ee 100644 --- a/XenModel/Utils/Helpers.cs +++ b/XenModel/Utils/Helpers.cs @@ -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; }