Browse Source
refactor: Clean up filter handling in UserManagement and optimize permission checks in PermissionManagementModal
feat/mudblazor
maliming
4 weeks ago
No known key found for this signature in database
GPG Key ID: A646B9CB645ECEA4
2 changed files with
3 additions and
3 deletions
-
modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs
|
|
|
@ -91,7 +91,6 @@ public partial class UserManagement |
|
|
|
{ |
|
|
|
if (e.Key == "Enter") |
|
|
|
{ |
|
|
|
GetListInput.Filter = GetListInput.Filter; |
|
|
|
CurrentPage = 1; |
|
|
|
await _dataGrid.ReloadServerDataAsync(); |
|
|
|
} |
|
|
|
|
|
|
|
@ -316,6 +316,7 @@ public partial class PermissionManagementModal |
|
|
|
} |
|
|
|
|
|
|
|
return permissionGrantInfo.IsGranted && |
|
|
|
permissionGrantInfo.GrantedProviders.Any() && |
|
|
|
permissionGrantInfo.GrantedProviders.All(p => p.ProviderName != _providerName); |
|
|
|
} |
|
|
|
|
|
|
|
@ -378,8 +379,8 @@ public partial class PermissionManagementModal |
|
|
|
? _allGroups.ToList() |
|
|
|
: _allGroups.Where(x => x.DisplayName.Contains(_permissionGroupSearchText!, StringComparison.OrdinalIgnoreCase) || x.Permissions.Any(permission => permission.DisplayName.Contains(_permissionGroupSearchText!, StringComparison.OrdinalIgnoreCase))).ToList(); |
|
|
|
|
|
|
|
GrantAll = _groups.SelectMany(x => x.Permissions).All(p => p.IsGranted); |
|
|
|
GrantAny = !GrantAll && _groups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); |
|
|
|
GrantAll = _allGroups.SelectMany(x => x.Permissions).All(p => p.IsGranted); |
|
|
|
GrantAny = !GrantAll && _allGroups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); |
|
|
|
|
|
|
|
NormalizePermissionGroup(false); |
|
|
|
} |
|
|
|
|