From d99a00164a83c37afadc45fa4943ff081d4c01d6 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 2 Jun 2020 04:43:04 +0300 Subject: [PATCH] Updated IdentityUserManager Added includeDetails for query --- .../Volo/Abp/Identity/IdentityUserManager.cs | 3 ++- .../Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs index d22eef5af6..2400743ab3 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs @@ -190,12 +190,13 @@ namespace Volo.Abp.Identity } [UnitOfWork] - public virtual async Task> GetOrganizationUnitsAsync(IdentityUser user) + public virtual async Task> GetOrganizationUnitsAsync(IdentityUser user, bool includeDetails = false) { await IdentityUserRepository.EnsureCollectionLoadedAsync(user, u => u.OrganizationUnits, CancellationTokenProvider.Token); return await OrganizationUnitRepository.GetListAsync( user.OrganizationUnits.Select(t => t.OrganizationUnitId), + includeDetails, cancellationToken: CancellationToken ); } diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs index 4c63ce703d..88db03a7f2 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs @@ -158,7 +158,7 @@ namespace Volo.Abp.Identity.MongoDB //var update = Builders.Update.PullFilter(y => y.OrganizationUnits, iou=> iou); //var result = await DbContext.Users.UpdateManyAsync(filter, update); - + //TODO: gterdem - Not working, not saving/updating the user. Fix for (int i = 0; i < users.Count; i++) { users[i].RemoveOrganizationUnit(organizationUnit.Id);