Commit merge and fixed merging impact
This commit is contained in:
commit
8bc4ebc9d9
31 changed files with 1422 additions and 241 deletions
|
@ -245,9 +245,9 @@ namespace WebsitePanel.EnterpriseServer
|
|||
#region Security Groups
|
||||
|
||||
[WebMethod]
|
||||
public int CreateSecurityGroup(int itemId, string displayName, string managedBy)
|
||||
public int CreateSecurityGroup(int itemId, string displayName)
|
||||
{
|
||||
return OrganizationController.CreateSecurityGroup(itemId, displayName, managedBy);
|
||||
return OrganizationController.CreateSecurityGroup(itemId, displayName);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
|
@ -263,9 +263,9 @@ namespace WebsitePanel.EnterpriseServer
|
|||
}
|
||||
|
||||
[WebMethod]
|
||||
public int SetSecurityGroupGeneralSettings(int itemId, int accountId, string displayName, string managedBy, string[] memberAccounts, string notes)
|
||||
public int SetSecurityGroupGeneralSettings(int itemId, int accountId, string displayName, string[] memberAccounts, string notes)
|
||||
{
|
||||
return OrganizationController.SetSecurityGroupGeneralSettings(itemId, accountId, displayName, managedBy, memberAccounts, notes);
|
||||
return OrganizationController.SetSecurityGroupGeneralSettings(itemId, accountId, displayName, memberAccounts, notes);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
|
@ -276,11 +276,29 @@ namespace WebsitePanel.EnterpriseServer
|
|||
}
|
||||
|
||||
[WebMethod]
|
||||
public int AddUserToSecurityGroup(int itemId, int userAccountId, int groupAccountId)
|
||||
public int AddUserToSecurityGroup(int itemId, int userAccountId, string groupName)
|
||||
{
|
||||
return OrganizationController.AddUserToSecurityGroup(itemId, userAccountId, groupAccountId);
|
||||
return OrganizationController.AddUserToSecurityGroup(itemId, userAccountId, groupName);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
public int DeleteUserFromSecurityGroup(int itemId, int userAccountId, string groupName)
|
||||
{
|
||||
return OrganizationController.DeleteUserFromSecurityGroup(itemId, userAccountId, groupName);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
public ExchangeAccount[] GetSecurityGroupsByMember(int itemId, int accountId)
|
||||
{
|
||||
return OrganizationController.GetSecurityGroupsByMember(itemId, accountId);
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
public List<ExchangeAccount> SearchSecurityGroups(int itemId, string filterColumn, string filterValue, string sortColumn)
|
||||
{
|
||||
return OrganizationController.SearchSecurityGroups(itemId, filterColumn, filterValue, sortColumn);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue