zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: Webinstaller was not loading. Web component was wrongly detected.

Browse source
This commit is contained in:
robvde 2012-10-14 15:59:18 +04:00
parent cbb7befc31
commit 981d7e7ddc
1 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

45
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/OperatingSystems/OperatingSystemController.cs
View file

@ -412,33 +412,52 @@ namespace WebsitePanel.EnterpriseServer
public static bool CheckLoadUserProfile(int serverId) public static bool CheckLoadUserProfile(int serverId)
{ {
int packageId = getIISPackageId(); int serviceId = getWebServiceId(serverId);
if (packageId != -1) if (serviceId != -1)
{ {
int serviceId = DataProvider.GetServiceIdByProviderForServer(packageId, serverId);
return WebServerController.GetWebServer(serviceId).CheckLoadUserProfile(); return WebServerController.GetWebServer(serviceId).CheckLoadUserProfile();
} }
return false; return false;
} }
private static int getIISPackageId() private static int getWebServiceId(int serverId)
{ {
int packageId = DataProvider.GetPackageIdByName("IIS80"); DataSet dsServices = ServerController.GetRawServicesByServerId(serverId);
if (packageId == -1)
packageId = DataProvider.GetPackageIdByName("IIS70");
if (packageId == -1)
packageId = DataProvider.GetPackageIdByName("IIS60");
int webGroup = -1;
if (dsServices.Tables.Count < 1) return -1;
return packageId; foreach (DataRow r in dsServices.Tables[0].Rows)
{
if (r["GroupName"].ToString() == "Web")
{
webGroup = (int)r["GroupID"];
break;
}
}
if (webGroup == -1) return -1;
foreach (DataRow r in dsServices.Tables[1].Rows)
{
if ((int)r["GroupID"] == webGroup)
{
return (int)r["ServiceID"];
}
}
return -1;
} }
public static void EnableLoadUserProfile(int serverId) public static void EnableLoadUserProfile(int serverId)
{ {
int packageId = getIISPackageId(); int serviceId = getWebServiceId(serverId);
if (packageId != -1) if (serviceId != -1)
{ {
int serviceId = DataProvider.GetServiceIdByProviderForServer(packageId, serverId);
WebServerController.GetWebServer(serviceId).EnableLoadUserProfile(); WebServerController.GetWebServer(serviceId).EnableLoadUserProfile();
} }
} }