Browse Source

Merge pull request #24807 from abpframework/fix/permission-modal-grant-all-indeterminate-state

Fix Grant All checkbox not showing indeterminate state in permission modal
pull/24848/head
Yağmur Çelik 6 months ago
committed by GitHub
parent
commit
79fd59224d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 16
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs

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

@ -62,8 +62,8 @@ public partial class PermissionManagementModal
NormalizePermissionGroup();
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);
await InvokeAsync(_modal.Show);
}
@ -203,8 +203,8 @@ public partial class PermissionManagementModal
}
}
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);
await InvokeAsync(StateHasChanged);
}
@ -226,8 +226,8 @@ public partial class PermissionManagementModal
}
}
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);
await InvokeAsync(StateHasChanged);
}
@ -339,8 +339,8 @@ public partial class PermissionManagementModal
_permissionGroupSearchText = value;
_groups = _permissionGroupSearchText.IsNullOrWhiteSpace() ? _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);

Loading…
Cancel
Save