IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/invite-accounts' of github.com:ONLYOFFICE/DocSpace into feature/invite-accounts

Browse Source
This commit is contained in:
Ilya Oleshko 2022-10-28 11:23:14 +03:00
commit 28c5e1fa40
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ASC.Api.Core/Model/EmployeeFullDto.cs
View File

@ -50,7 +50,7 @@ public class EmployeeFullDto : EmployeeDto
public bool IsLDAP { get; set; }
public List<string> ListAdminModules { get; set; }
public bool IsOwner { get; set; }
public bool IsUser { get; set; }
public bool IsVisitor { get; set; }
public string CultureName { get; set; }
public string MobilePhone { get; set; }
public MobilePhoneActivationStatus MobilePhoneActivationStatus { get; set; }
@ -190,7 +190,7 @@ public class EmployeeFullDtoHelper : EmployeeDtoHelper
Terminated = _apiDateTimeHelper.Get(userInfo.TerminatedDate),
WorkFrom = _apiDateTimeHelper.Get(userInfo.WorkFromDate),
Email = userInfo.Email,
IsUser = _userManager.IsUser(userInfo),
IsVisitor = _userManager.IsUser(userInfo),
IsDocSpaceAdmin = _userManager.IsDocSpaceAdmin(userInfo),
IsOwner = userInfo.IsOwner(_context.Tenant),
IsLDAP = userInfo.IsLDAP(),

2
web/ASC.Web.Core/Users/UserManagerWrapper.cs
View File

@ -120,7 +120,7 @@ public sealed class UserManagerWrapper
throw new InvalidOperationException($"User with email {mail.Address} already exists or is invited");
}
if (type is EmployeeType.User or EmployeeType.DocSpaceAdmin)
if (type is EmployeeType.RoomAdmin or EmployeeType.DocSpaceAdmin)
{
await _countManagerChecker.CheckAppend();
}