Browse Source

Merge pull request #12300 from abpframework/issue-9581

Add proper title to Abp-permission-manager.component #9581
pull/12317/head
Muhammed Altuğ 4 years ago
committed by GitHub
parent
commit
5ceec91ea7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  2. 5
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
  3. 2
      npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts
  4. 4
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
  5. 3
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

1
npm/ng-packs/packages/identity/src/lib/components/users/users.component.html

@ -95,6 +95,7 @@
};
let init = initTemplate
"
[entityDisplayName]="entityDisplayName"
(abpInit)="init(abpPermissionManagement)"
>
</abp-permission-management>

5
npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts

@ -59,6 +59,8 @@ export class UsersComponent implements OnInit {
permissionManagementKey = ePermissionManagementComponents.PermissionManagement;
entityDisplayName: string;
trackByFn: TrackByFunction<AbstractControl> = (index, item) => Object.keys(item)[0] || index;
onVisiblePermissionChange = event => {
@ -176,8 +178,9 @@ export class UsersComponent implements OnInit {
this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => (this.data = res));
}
openPermissionsModal(providerKey: string) {
openPermissionsModal(providerKey: string, entityDisplayName?: string) {
this.providerKey = providerKey;
this.entityDisplayName = entityDisplayName;
setTimeout(() => {
this.visiblePermissions = true;
}, 0);

2
npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts

@ -15,7 +15,7 @@ export const DEFAULT_USERS_ENTITY_ACTIONS = EntityAction.createMany<IdentityUser
text: 'AbpIdentity::Permissions',
action: data => {
const component = data.getInjected(UsersComponent);
component.openPermissionsModal(data.record.id);
component.openPermissionsModal(data.record.id, data.record.userName);
},
permission: 'AbpIdentity.Users.ManagePermissions',
},

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

@ -1,9 +1,9 @@
<abp-modal [(visible)]="visible" [busy]="modalBusy" [options]="{ size: 'lg' }">
<ng-container *ngIf="data.entityDisplayName">
<ng-container *ngIf="data.entityDisplayName || entityDisplayName">
<ng-template #abpHeader>
<h4>
{{ 'AbpPermissionManagement::Permissions' | abpLocalization }} -
{{ data.entityDisplayName }}
{{ entityDisplayName || data.entityDisplayName }}
</h4>
</ng-template>
<ng-template #abpBody>

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

@ -59,6 +59,9 @@ export class PermissionManagementComponent
protected _visible = false;
@Input()
entityDisplayName: string | undefined;
@Input()
get visible(): boolean {
return this._visible;

Loading…
Cancel
Save