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

Commit merge and fixed merging impact

Browse source
This commit is contained in:
robvde 2013-08-26 19:40:04 +04:00
commit 8bc4ebc9d9
31 changed files with 1422 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

14
WebsitePanel/Sources/WebsitePanel.Server/Organizations.asmx.cs
View file

@ -111,9 +111,9 @@ namespace WebsitePanel.Server
}
[WebMethod, SoapHeader("settings")]
public int CreateSecurityGroup(string organizationId, string groupName, string managedBy)
public int CreateSecurityGroup(string organizationId, string groupName)
{
return Organization.CreateSecurityGroup(organizationId, groupName, managedBy);
return Organization.CreateSecurityGroup(organizationId, groupName);
}
[WebMethod, SoapHeader("settings")]
@ -129,9 +129,9 @@ namespace WebsitePanel.Server
}
[WebMethod, SoapHeader("settings")]
public void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes)
public void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string[] memberAccounts, string notes)
{
Organization.SetSecurityGroupGeneralSettings(organizationId, groupName, managedBy, memberAccounts, notes);
Organization.SetSecurityGroupGeneralSettings(organizationId, groupName, memberAccounts, notes);
}
[WebMethod, SoapHeader("settings")]
@ -140,6 +140,12 @@ namespace WebsitePanel.Server
Organization.AddUserToSecurityGroup(organizationId, loginName, groupName);
}
[WebMethod, SoapHeader("settings")]
public void DeleteUserFromSecurityGroup(string organizationId, string loginName, string groupName)
{
Organization.DeleteUserFromSecurityGroup(organizationId, loginName, groupName);
}
[WebMethod, SoapHeader("settings")]
public void SetUserGeneralSettings(string organizationId, string accountName, string displayName, string password,
bool hideFromAddressBook, bool disabled, bool locked, string firstName, string initials, string lastName,