Merge
This commit is contained in:
commit
15ff62dbab
2951 changed files with 72429 additions and 7413 deletions
|
@ -1,4 +1,4 @@
|
|||
// Copyright (c) 2011, Outercurve Foundation.
|
||||
// Copyright (c) 2015, Outercurve Foundation.
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification,
|
||||
|
@ -75,6 +75,12 @@ namespace WebsitePanel.EnterpriseServer
|
|||
return OrganizationController.GetOrganizations(packageId, recursive);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
public Organization GetOrganizationById(string organizationId)
|
||||
{
|
||||
return OrganizationController.GetOrganizationById(organizationId);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
public string GetOrganizationUserSummuryLetter(int itemId, int accountId, bool pmm, bool emailMode, bool signup)
|
||||
{
|
||||
|
@ -158,6 +164,18 @@ namespace WebsitePanel.EnterpriseServer
|
|||
return OrganizationController.SetOrganizationDefaultDomain(itemId, domainId);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
public DataSet GetOrganizationObjectsByDomain(int itemId, string domainName)
|
||||
{
|
||||
return OrganizationController.GetOrganizationObjectsByDomain(itemId, domainName);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
public bool CheckDomainUsedByHostedOrganization(int itemId, int domainId)
|
||||
{
|
||||
return OrganizationController.CheckDomainUsedByHostedOrganization(itemId, domainId);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Users
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue