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

RDS Users fixes

Browse source
This commit is contained in:
vfedosevich 2015-05-29 06:19:51 -07:00
parent 2b51465900
commit 7a4301fbea
5 changed files with 69 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/RemoteDesktopServices/RemoteDesktopServicesController.cs
View file

@ -667,7 +667,7 @@ namespace WebsitePanel.EnterpriseServer
var collectionSettings = ObjectUtils.FillObjectFromDataReader<RdsCollectionSettings>(DataProvider.GetRdsCollectionSettingsByCollectionId(collectionId));
collection.Settings = collectionSettings;
var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "ADD_RDS_COLLECTION");
var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "GET_RDS_COLLECTION");
try
{
@ -682,13 +682,23 @@ namespace WebsitePanel.EnterpriseServer
var rds = RemoteDesktopServicesHelpers.GetRemoteDesktopServices(RemoteDesktopServicesHelpers.GetRemoteDesktopServiceID(org.PackageId));
rds.GetCollection(collection.Name);
FillRdsCollection(collection);
}
catch (Exception ex)
{
result.AddError("REMOTE_DESKTOP_SERVICES_ADD_RDS_COLLECTION", ex);
}
FillRdsCollection(collection);
finally
{
if (!result.IsSuccess)
{
TaskManager.CompleteResultTask(result);
}
else
{
TaskManager.CompleteResultTask();
}
}
return collection;
}
@ -2043,6 +2053,8 @@ namespace WebsitePanel.EnterpriseServer
private static string GetRdsServerStatusInternal(int? itemId, string fqdnName)
{
return "Online";
var result = "Unavailable";
var serviceId = GetRdsServiceId(itemId);