Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into dev

pull/4415/head
Alper Ebicoglu 6 years ago
parent
commit
ed6e59f09e
  1. 7
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
  2. 7
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

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

@ -26,11 +26,16 @@
<ul class="nav nav-pills flex-column"> <ul class="nav nav-pills flex-column">
<li *ngFor="let group of groups$ | async; trackBy: trackByFn" class="nav-item"> <li *ngFor="let group of groups$ | async; trackBy: trackByFn" class="nav-item">
<a <a
*ngIf="{ assignedCount: getAssignedCount(group.name) } as data"
class="nav-link pointer" class="nav-link pointer"
[class.active]="selectedGroup?.name === group?.name" [class.active]="selectedGroup?.name === group?.name"
(click)="onChangeGroup(group)" (click)="onChangeGroup(group)"
>{{ group?.displayName }}</a
> >
<div [class.font-weight-bold]="data.assignedCount">
{{ group?.displayName }}
<span>({{ data.assignedCount }})</span>
</div>
</a>
</li> </li>
</ul> </ul>
</div> </div>

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

@ -261,6 +261,13 @@ export class PermissionManagementComponent
this.setTabCheckboxState(); this.setTabCheckboxState();
this.setGrantCheckboxState(); this.setGrantCheckboxState();
} }
getAssignedCount(groupName: string) {
return this.permissions.reduce(
(acc, val) => (val.name.split('.')[0] === groupName && val.isGranted ? acc + 1 : acc),
0,
);
}
} }
function findMargin( function findMargin(

Loading…
Cancel
Save