Browse Source

fix(user, permission): bug fix

pull/1577/head
mehmet-erim 7 years ago
parent
commit
0004677796
  1. 4
      npm/ng-packs/packages/identity/src/lib/components/users/users.component.html
  2. 11
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html
  3. 10
      npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.ts

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

@ -83,7 +83,7 @@
</ng-template>
<ng-template #abpBody>
<perfect-scrollbar class="ps-show-always" style="max-height: 65vh;">
<perfect-scrollbar class="ps-show-always" style="max-height: 70vh;">
<form [formGroup]="form">
<ngb-tabset>
<ngb-tab [title]="'AbpIdentity::UserInformations' | abpLocalization">
@ -92,7 +92,7 @@
<div class="form-group">
<label for="user-name">{{ 'AbpIdentity::UserName' | abpLocalization }}</label
><span> * </span>
<input type="text" id="user-name" class="form-control" formControlName="userName" autofocus/>
<input type="text" id="user-name" class="form-control" formControlName="userName" autofocus />
</div>
<div class="form-group">

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

@ -1,4 +1,4 @@
<abp-modal [(visible)]="visible">
<abp-modal [(visible)]="visible" (init)="initModal()">
<ng-container *ngIf="{ entityName: entityName$ | async } as data">
<ng-template #abpHeader>
<h4>{{ 'AbpPermissionManagement::Permissions' | abpLocalization }} - {{ data.entityName }}</h4>
@ -24,9 +24,12 @@
<ul class="nav nav-pills flex-column">
<perfect-scrollbar class="ps-show-always" style="max-height: 70vh;">
<li *ngFor="let group of groups$ | async; trackBy: trackByFn" class="nav-item">
<a class="nav-link" [class.active]="selectedGroup.name === group.name" (click)="onChangeGroup(group)">{{
group?.displayName
}}</a>
<a
class="nav-link pointer"
[class.active]="selectedGroup.name === group.name"
(click)="onChangeGroup(group)"
>{{ group?.displayName }}</a
>
</li>
</perfect-scrollbar>
</ul>

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

@ -216,14 +216,14 @@ export class PermissionManagementComponent implements OnInit, OnChanges {
this.permissions = getPermissions(permissionRes.groups);
this.visible = true;
setTimeout(() => {
this.setTabCheckboxState();
this.setGrantCheckboxState();
}, 0);
});
}
initModal() {
this.setTabCheckboxState();
this.setGrantCheckboxState();
}
ngOnChanges({ visible }: SimpleChanges): void {
if (!visible) return;

Loading…
Cancel
Save