Merge branch 'feature/invite-accounts' of github.com:ONLYOFFICE/DocSpace into feature/invite-accounts
This commit is contained in:
commit
28c5e1fa40
@ -50,7 +50,7 @@ public class EmployeeFullDto : EmployeeDto
|
|||||||
public bool IsLDAP { get; set; }
|
public bool IsLDAP { get; set; }
|
||||||
public List<string> ListAdminModules { get; set; }
|
public List<string> ListAdminModules { get; set; }
|
||||||
public bool IsOwner { get; set; }
|
public bool IsOwner { get; set; }
|
||||||
public bool IsUser { get; set; }
|
public bool IsVisitor { get; set; }
|
||||||
public string CultureName { get; set; }
|
public string CultureName { get; set; }
|
||||||
public string MobilePhone { get; set; }
|
public string MobilePhone { get; set; }
|
||||||
public MobilePhoneActivationStatus MobilePhoneActivationStatus { get; set; }
|
public MobilePhoneActivationStatus MobilePhoneActivationStatus { get; set; }
|
||||||
@ -190,7 +190,7 @@ public class EmployeeFullDtoHelper : EmployeeDtoHelper
|
|||||||
Terminated = _apiDateTimeHelper.Get(userInfo.TerminatedDate),
|
Terminated = _apiDateTimeHelper.Get(userInfo.TerminatedDate),
|
||||||
WorkFrom = _apiDateTimeHelper.Get(userInfo.WorkFromDate),
|
WorkFrom = _apiDateTimeHelper.Get(userInfo.WorkFromDate),
|
||||||
Email = userInfo.Email,
|
Email = userInfo.Email,
|
||||||
IsUser = _userManager.IsUser(userInfo),
|
IsVisitor = _userManager.IsUser(userInfo),
|
||||||
IsDocSpaceAdmin = _userManager.IsDocSpaceAdmin(userInfo),
|
IsDocSpaceAdmin = _userManager.IsDocSpaceAdmin(userInfo),
|
||||||
IsOwner = userInfo.IsOwner(_context.Tenant),
|
IsOwner = userInfo.IsOwner(_context.Tenant),
|
||||||
IsLDAP = userInfo.IsLDAP(),
|
IsLDAP = userInfo.IsLDAP(),
|
||||||
|
@ -120,7 +120,7 @@ public sealed class UserManagerWrapper
|
|||||||
throw new InvalidOperationException($"User with email {mail.Address} already exists or is invited");
|
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();
|
await _countManagerChecker.CheckAppend();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user