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

Merge

Browse source
This commit is contained in:
me 2015-03-27 15:57:39 +04:00
commit 68ea4a618a
39 changed files with 2233 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esHostedSharePointServers.asmx.cs
View file

@ -55,13 +55,14 @@ namespace WebsitePanel.EnterpriseServer
/// <param name="sortColumn">Sort column name.</param>
/// <param name="startRow">Row index to start from.</param>
/// <param name="maximumRows">Maximum number of rows to retrieve.</param>
/// <param name="groupName">Resource group name.</param>
/// <returns>Site collections in raw format.</returns>
[WebMethod]
public SharePointSiteCollectionListPaged GetSiteCollectionsPaged(int packageId, int organizationId,
string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows)
string filterColumn, string filterValue, string sortColumn, int startRow, int maximumRows, string groupName)
{
return HostedSharePointServerController.GetSiteCollectionsPaged(packageId, organizationId, filterColumn, filterValue,
sortColumn, startRow, maximumRows);
sortColumn, startRow, maximumRows, groupName);
}
/// <summary>
@ -71,7 +72,7 @@ namespace WebsitePanel.EnterpriseServer
[WebMethod]
public int[] GetSupportedLanguages(int packageId)
{
return HostedSharePointServerController.GetSupportedLanguages(packageId);
return HostedSharePointServerController.GetSupportedLanguages(packageId);
}
/// <summary>
@ -79,11 +80,12 @@ namespace WebsitePanel.EnterpriseServer
/// </summary>
/// <param name="packageId">Package that owns site collections.</param>
/// <param name="recursive">A value which shows whether nested spaces must be searched as well.</param>
/// <param name="groupName">Resource group name.</param>
/// <returns>List of found site collections.</returns>
[WebMethod]
public List<SharePointSiteCollection> GetSiteCollections(int packageId, bool recursive)
public List<SharePointSiteCollection> GetSiteCollections(int packageId, bool recursive, string groupName)
{
return HostedSharePointServerController.GetSiteCollections(packageId, recursive);
return HostedSharePointServerController.GetSiteCollections(packageId, recursive, groupName);
}
[WebMethod]
@ -114,7 +116,7 @@ namespace WebsitePanel.EnterpriseServer
public SharePointSiteCollection GetSiteCollectionByDomain(int organizationId, string domain)
{
DomainInfo domainInfo = ServerController.GetDomain(domain);
SharePointSiteCollectionListPaged existentSiteCollections = this.GetSiteCollectionsPaged(domainInfo.PackageId, organizationId, "ItemName", String.Format("%{0}", domain), String.Empty, 0, Int32.MaxValue);
SharePointSiteCollectionListPaged existentSiteCollections = this.GetSiteCollectionsPaged(domainInfo.PackageId, organizationId, "ItemName", String.Format("%{0}", domain), String.Empty, 0, Int32.MaxValue, null);
foreach (SharePointSiteCollection existentSiteCollection in existentSiteCollections.SiteCollections)
{
Uri existentSiteCollectionUri = new Uri(existentSiteCollection.Name);
@ -131,11 +133,12 @@ namespace WebsitePanel.EnterpriseServer
/// Adds SharePoint site collection.
/// </summary>
/// <param name="item">Site collection description.</param>
/// <param name="groupName">Resource group name.</param>
/// <returns>Created site collection id within metabase.</returns>
[WebMethod]
public int AddSiteCollection(SharePointSiteCollection item)
public int AddSiteCollection(SharePointSiteCollection item, string groupName)
{
return HostedSharePointServerController.AddSiteCollection(item);
return HostedSharePointServerController.AddSiteCollection(item, groupName);
}
/// <summary>

13
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs
View file

@ -39,6 +39,7 @@ using Microsoft.Web.Services3;
using WebsitePanel.Providers.Common;
using WebsitePanel.Providers.HostedSolution;
using WebsitePanel.Providers.RemoteDesktopServices;
using WebsitePanel.EnterpriseServer.Base.RDS;
namespace WebsitePanel.EnterpriseServer
{
@ -367,5 +368,17 @@ namespace WebsitePanel.EnterpriseServer
{
return RemoteDesktopServicesController.SendRdsSetupLetter(itemId, accountId, to, cc);
}
[WebMethod]
public RdsServerSettings GetRdsServerSettings(int serverId, string settingsName)
{
return RemoteDesktopServicesController.GetRdsServerSettings(serverId, settingsName);
}
[WebMethod]
public int UpdateRdsServerSettings(int serverId, string settingsName, RdsServerSettings settings)
{
return RemoteDesktopServicesController.UpdateRdsServerSettings(serverId, settingsName, settings);
}
}
}