Browse Source

Merge pull request #22182 from abpframework/auto-merge/rel-9-1/3487

Merge branch dev with rel-9.1
pull/22188/head
maliming 12 months ago
committed by GitHub
parent
commit
3394a0ced7
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>
<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="col-md-4">
<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();
if (!search) {
this.setSelectedGroup(groups[0]);
return groups;
}
@ -176,9 +177,7 @@ export class PermissionManagementComponent
if (groups.length) {
this.setSelectedGroup(groups[0]);
this.disabledSelectAllInAllTabs = false;
} else {
this.disabledSelectAllInAllTabs = true;
this.selectedGroupPermissions = [];
}
@ -323,6 +322,9 @@ export class PermissionManagementComponent
);
const selectedPermissions = selectablePermissions.filter(per => per.isGranted);
const element = document.querySelector('#select-all-in-this-tabs') as any;
if (!element) {
return;
}
if (selectedPermissions.length === selectablePermissions.length) {
element.indeterminate = false;
@ -373,7 +375,7 @@ export class PermissionManagementComponent
onClickSelectAll() {
if (this.filter()) {
this.filter.set('');
}
}
this.permissions = this.permissions.map(permission => ({
...permission,

Loading…
Cancel
Save