Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-24 22:06:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk/xenadmin

Browse Source
This commit is contained in:
Adrian Jachacy 2013-07-23 16:29:16 +01:00
commit da00b13bb9
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Dialogs/LicenseManager/LicenseActivationRequest.cs
View File

@ -71,7 +71,7 @@ namespace XenAdmin.Dialogs
public static bool CanActivate(Pool pool)
{
return pool.Connection.Cache.Hosts.All(CanActivate);
return pool.Connection.Cache.Hosts.Any(CanActivate);
}
public ReadOnlyCollection<Host> HostsThatCanBeActivated

10
XenModel/Actions/Host/ApplyLicenseEditionAction.cs
View File

@ -173,9 +173,13 @@ namespace XenAdmin.Actions
// PR-1102: catch the host's license data, before applying the new one, so it can be sent later to the licensing server
LicensingHelper.LicenseDataStruct previousLicenseData = new LicensingHelper.LicenseDataStruct(host);
if(xo is Host)
if(xo is Host && host != null)
{
Host.apply_edition(host.Connection.Session, host.opaque_ref, Host.GetEditionText(_edition), false);
if (Helpers.AugustaOrGreater(host))
Host.apply_edition(host.Connection.Session, host.opaque_ref, Host.GetEditionText(_edition),false);
else
Host.apply_edition(host.Connection.Session, host.opaque_ref, Host.GetEditionText(_edition));
// PR-1102: populate the list of updated hosts
updatedHosts.Add(host, previousLicenseData);
}
@ -186,7 +190,7 @@ namespace XenAdmin.Actions
{
foreach (Host poolHost in xo.Connection.Cache.Hosts)
{
Host.apply_edition(host.Connection.Session, poolHost.opaque_ref, Host.GetEditionText(_edition), false);
Host.apply_edition(host.Connection.Session, poolHost.opaque_ref, Host.GetEditionText(_edition));
}
}
else

11
XenModel/Utils/Helpers.cs
View File

@ -451,13 +451,10 @@ namespace XenAdmin.Core
if (host == null)
return true;
return false;
//TODO: uncomment and update Augusta platform_version when it's known
//string platform_version = HostPlatformVersion(host);
//return
// platform_version != null && productVersionCompare(platform_version, "x.x.x") >= 0 ||
// HostBuildNumber(host) == CUSTOM_BUILD_NUMBER;
string platform_version = HostPlatformVersion(host);
return
platform_version != null && productVersionCompare(platform_version, "1.8.50") >= 0 ||
HostBuildNumber(host) == CUSTOM_BUILD_NUMBER;
}
// CP-3435: Disable Check for Updates in Common Criteria Certification project