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

RDS UI changes

Browse source
This commit is contained in:
vfedosevich 2015-01-22 06:49:15 -08:00
parent 3dcf48966a
commit 34d0c3b6e2
14 changed files with 257 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ namespace WebsitePanel.EnterpriseServer
return GetOrganizationRdsCollectionsInternal(itemId);
}
public static ResultObject AddRdsCollection(int itemId, RdsCollection collection)
public static int AddRdsCollection(int itemId, RdsCollection collection)
{
return AddRdsCollectionInternal(itemId, collection);
}
@ -265,7 +265,7 @@ namespace WebsitePanel.EnterpriseServer
return collections;
}
private static ResultObject AddRdsCollectionInternal(int itemId, RdsCollection collection)
private static int AddRdsCollectionInternal(int itemId, RdsCollection collection)
{
var result = TaskManager.StartResultTask<ResultObject>("REMOTE_DESKTOP_SERVICES", "ADD_RDS_COLLECTION");
@ -274,10 +274,8 @@ namespace WebsitePanel.EnterpriseServer
// load organization
Organization org = OrganizationController.GetOrganization(itemId);
if (org == null)
{
result.IsSuccess = false;
result.AddError("", new NullReferenceException("Organization not found"));
return result;
{
return -1;
}
var rds = GetRemoteDesktopServices(GetRemoteDesktopServiceID(org.PackageId));
@ -291,8 +289,7 @@ namespace WebsitePanel.EnterpriseServer
}
}
catch (Exception ex)
{
result.AddError("REMOTE_DESKTOP_SERVICES_ADD_RDS_COLLECTION", ex);
{
throw TaskManager.WriteError(ex);
}
finally
@ -307,7 +304,7 @@ namespace WebsitePanel.EnterpriseServer
}
}
return result;
return collection.Id;
}
private static ResultObject EditRdsCollectionInternal(int itemId, RdsCollection collection)