diff --git a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html index 09dcdb1be3..20d5509d15 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html @@ -55,6 +55,7 @@ }; let init = initTemplate " + [title]="providerKey" (abpInit)="init(abpPermissionManagement)" > diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html index 6f42485364..a481b9d697 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.html @@ -95,6 +95,7 @@ }; let init = initTemplate " + [title]="userName" (abpInit)="init(abpPermissionManagement)" > diff --git a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts index 6f458a781b..1c9f6f0f17 100644 --- a/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts +++ b/npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts @@ -64,6 +64,7 @@ export class UsersComponent implements OnInit { onVisiblePermissionChange = event => { this.visiblePermissions = event; }; + userName: string; get roleGroups(): FormGroup[] { return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || []; @@ -176,8 +177,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, userName:string) { this.providerKey = providerKey; + this.userName = userName; setTimeout(() => { this.visiblePermissions = true; }, 0); diff --git a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts b/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts index 13f058dd37..0bd21c571b 100644 --- a/npm/ng-packs/packages/identity/src/lib/defaults/default-users-entity-actions.ts +++ b/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 { const component = data.getInjected(UsersComponent); - component.openPermissionsModal(data.record.id); + component.openPermissionsModal(data.record.id, data.record.userName); }, permission: 'AbpIdentity.Users.ManagePermissions', }, diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html index a28607bb59..d2d14035ca 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html @@ -2,8 +2,8 @@

- {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - - {{ data.entityDisplayName }} + {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} + - {{ title }}

diff --git a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts index e43acdd605..bc07bb6583 100644 --- a/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts +++ b/npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts @@ -64,6 +64,9 @@ export class PermissionManagementComponent return this._visible; } + @Input() + title = ''; + set visible(value: boolean) { if (value === this._visible) return;