Browse Source

Change permisson title input name to entityDisplayName

pull/12300/head
Mahmut Gundogdu 5 years ago
parent
commit
8744d1953b
  1. 1
      npm/ng-packs/packages/identity/src/lib/components/roles/roles.component.html
  2. 2
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  3. 6
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.ts
  4. 6
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
  5. 2
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

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

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

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

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

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

@ -64,7 +64,7 @@ export class UsersComponent implements OnInit {
onVisiblePermissionChange = event => { onVisiblePermissionChange = event => {
this.visiblePermissions = event; this.visiblePermissions = event;
}; };
userName: string; entityDisplayName: string;
get roleGroups(): FormGroup[] { get roleGroups(): FormGroup[] {
return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || []; return ((this.form.get('roleNames') as FormArray)?.controls as FormGroup[]) || [];
@ -177,9 +177,9 @@ export class UsersComponent implements OnInit {
this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => (this.data = res)); this.list.hookToQuery(query => this.service.getList(query)).subscribe(res => (this.data = res));
} }
openPermissionsModal(providerKey: string, userName:string) { openPermissionsModal(providerKey: string, entityDisplayName?: string) {
this.providerKey = providerKey; this.providerKey = providerKey;
this.userName = userName; this.entityDisplayName = entityDisplayName;
setTimeout(() => { setTimeout(() => {
this.visiblePermissions = true; this.visiblePermissions = true;
}, 0); }, 0);

6
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' }"> <abp-modal [(visible)]="visible" [busy]="modalBusy" [options]="{ size: 'lg' }">
<ng-container *ngIf="data.entityDisplayName"> <ng-container *ngIf="data.entityDisplayName || entityDisplayName">
<ng-template #abpHeader> <ng-template #abpHeader>
<h4> <h4>
{{ 'AbpPermissionManagement::Permissions' | abpLocalization }} {{ 'AbpPermissionManagement::Permissions' | abpLocalization }} -
<ng-template [ngIf]="title"> - </ng-template> {{ title }} {{ entityDisplayName || data.data.entityDisplayName }}
</h4> </h4>
</ng-template> </ng-template>
<ng-template #abpBody> <ng-template #abpBody>

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

@ -65,7 +65,7 @@ export class PermissionManagementComponent
} }
@Input() @Input()
title = ''; entityDisplayName: string | undefined;
set visible(value: boolean) { set visible(value: boolean) {
if (value === this._visible) return; if (value === this._visible) return;

Loading…
Cancel
Save