Browse Source

Merge pull request #22152 from abpframework/issue#19348-fixingPermissionFilterBug

Angular - Fixing filter bug on permission modal
pull/22182/head
oykuermann 2 years ago
committed by GitHub
parent
commit
4cdfee771f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
  2. 8
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

4
npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html

@ -40,7 +40,9 @@
</div> </div>
</div> </div>
<fieldset class="border rounded-4 p-3"> <fieldset class="border rounded-4 p-3">
<legend class="px-1 h5 mb-0">{{ 'AbpPermissionManagement::PermissionGroup' | abpLocalization }}</legend> <legend class="px-1 h5 mb-0">
{{ 'AbpPermissionManagement::PermissionGroup' | abpLocalization }}
</legend>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="overflow-auto lpx-scroll-pills-container scroll-in-modal"> <div class="overflow-auto lpx-scroll-pills-container scroll-in-modal">

8
npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

@ -164,6 +164,7 @@ export class PermissionManagementComponent
let groups = this.permissionGroupSignal(); let groups = this.permissionGroupSignal();
if (!search) { if (!search) {
this.setSelectedGroup(groups[0]);
return groups; return groups;
} }
@ -176,9 +177,7 @@ export class PermissionManagementComponent
if (groups.length) { if (groups.length) {
this.setSelectedGroup(groups[0]); this.setSelectedGroup(groups[0]);
this.disabledSelectAllInAllTabs = false;
} else { } else {
this.disabledSelectAllInAllTabs = true;
this.selectedGroupPermissions = []; this.selectedGroupPermissions = [];
} }
@ -323,6 +322,9 @@ export class PermissionManagementComponent
); );
const selectedPermissions = selectablePermissions.filter(per => per.isGranted); const selectedPermissions = selectablePermissions.filter(per => per.isGranted);
const element = document.querySelector('#select-all-in-this-tabs') as any; const element = document.querySelector('#select-all-in-this-tabs') as any;
if (!element) {
return;
}
if (selectedPermissions.length === selectablePermissions.length) { if (selectedPermissions.length === selectablePermissions.length) {
element.indeterminate = false; element.indeterminate = false;
@ -373,7 +375,7 @@ export class PermissionManagementComponent
onClickSelectAll() { onClickSelectAll() {
if (this.filter()) { if (this.filter()) {
this.filter.set(''); this.filter.set('');
} }
this.permissions = this.permissions.map(permission => ({ this.permissions = this.permissions.map(permission => ({
...permission, ...permission,

Loading…
Cancel
Save