Merge pull request #1747 from ONLYOFFICE/bugfix/bug-64157
fix Bug 64157
This commit is contained in:
commit
c221dd6a63
@ -331,14 +331,22 @@ public class UserManager
|
||||
return findUsers.ToArray();
|
||||
}
|
||||
|
||||
public async Task<UserInfo> UpdateUserInfo(UserInfo u)
|
||||
public async Task<UserInfo> UpdateUserInfo(UserInfo u, bool afterInvite = false)
|
||||
{
|
||||
if (IsSystemUser(u.Id))
|
||||
{
|
||||
return SystemUsers[u.Id];
|
||||
}
|
||||
|
||||
_permissionContext.DemandPermissions(new UserSecurityProvider(u.Id), Constants.Action_EditUser);
|
||||
if (afterInvite)
|
||||
{
|
||||
_permissionContext.DemandPermissions(new UserSecurityProvider(u.Id, this.GetUserType(u.Id)), Constants.Action_AddRemoveUser);
|
||||
}
|
||||
else
|
||||
{
|
||||
_permissionContext.DemandPermissions(new UserSecurityProvider(u.Id), Constants.Action_EditUser);
|
||||
}
|
||||
|
||||
|
||||
if (u.Status == EmployeeStatus.Terminated && u.Id == _tenantManager.GetCurrentTenant().OwnerId)
|
||||
{
|
||||
|
@ -193,7 +193,7 @@ public sealed class UserManagerWrapper
|
||||
UserInfo newUserInfo;
|
||||
if (updateExising)
|
||||
{
|
||||
newUserInfo = await _userManager.UpdateUserInfo(userInfo);
|
||||
newUserInfo = await _userManager.UpdateUserInfo(userInfo, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user