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 6f424853645..7873adf6ea1 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 @@

{{ (selected?.id ? 'AbpIdentity::Edit' : 'AbpIdentity::NewUser') | abpLocali }; let init = initTemplate " + [entityDisplayName]="entityDisplayName" (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 6f458a781b1..b8fadc81a1d 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 @@ -59,6 +59,8 @@ export class UsersComponent implements OnInit { permissionManagementKey = ePermissionManagementComponents.PermissionManagement; + entityDisplayName: string; + trackByFn: TrackByFunction = (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); 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 13f058dd379..0bd21c571bf 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 a28607bb593..5a9fa0dd5a0 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 @@ -1,9 +1,9 @@ - +

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

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 e43acdd605b..496b3bb989a 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 @@ -59,6 +59,9 @@ export class PermissionManagementComponent protected _visible = false; + @Input() + entityDisplayName: string | undefined; + @Input() get visible(): boolean { return this._visible;