Browse Source

refactor: Clean up filter handling in UserManagement and optimize permission checks in PermissionManagementModal

pull/25235/head
maliming 7 months ago
parent
commit
340416bdea
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 1
      modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs
  2. 5
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs

1
modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs

@ -91,7 +91,6 @@ public partial class UserManagement
{ {
if (e.Key == "Enter") if (e.Key == "Enter")
{ {
GetListInput.Filter = GetListInput.Filter;
CurrentPage = 1; CurrentPage = 1;
await _dataGrid.ReloadServerDataAsync(); await _dataGrid.ReloadServerDataAsync();
} }

5
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor.cs

@ -316,6 +316,7 @@ public partial class PermissionManagementModal
} }
return permissionGrantInfo.IsGranted && return permissionGrantInfo.IsGranted &&
permissionGrantInfo.GrantedProviders.Any() &&
permissionGrantInfo.GrantedProviders.All(p => p.ProviderName != _providerName); permissionGrantInfo.GrantedProviders.All(p => p.ProviderName != _providerName);
} }
@ -378,8 +379,8 @@ public partial class PermissionManagementModal
? _allGroups.ToList() ? _allGroups.ToList()
: _allGroups.Where(x => x.DisplayName.Contains(_permissionGroupSearchText!, StringComparison.OrdinalIgnoreCase) || x.Permissions.Any(permission => permission.DisplayName.Contains(_permissionGroupSearchText!, StringComparison.OrdinalIgnoreCase))).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); GrantAll = _allGroups.SelectMany(x => x.Permissions).All(p => p.IsGranted);
GrantAny = !GrantAll && _groups.SelectMany(x => x.Permissions).Any(p => p.IsGranted); GrantAny = !GrantAll && _allGroups.SelectMany(x => x.Permissions).Any(p => p.IsGranted);
NormalizePermissionGroup(false); NormalizePermissionGroup(false);
} }

Loading…
Cancel
Save