From 1ff8f552beac8f90b74b422c8a1b7482ef7be3b5 Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Tue, 9 Apr 2019 17:45:25 +0200 Subject: [PATCH] select right tab if password modification in admin users --- .../app/administration/user/user-administration.component.html | 2 +- .../app/administration/user/user-administration.component.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/frontend/app/administration/user/user-administration.component.html b/src/frontend/app/administration/user/user-administration.component.html index 680bbd3e54a..ddfc8e32f6f 100755 --- a/src/frontend/app/administration/user/user-administration.component.html +++ b/src/frontend/app/administration/user/user-administration.component.html @@ -4,7 +4,7 @@ [opened]="mobileQuery.matches ? false : true"> <menu-shortcut></menu-shortcut> <menu-nav></menu-nav> - <mat-nav-list style="width:250px;" *ngIf="!creationMode && !loading"> + <mat-nav-list *ngIf="!creationMode && !loading"> <h3 mat-subheader>{{lang.actions}}</h3> <a mat-list-item *ngIf="user.status != 'ABS'" (click)="activateAbsence()"> <mat-icon color="warn" mat-list-icon class="fa fa-plane"></mat-icon> diff --git a/src/frontend/app/administration/user/user-administration.component.ts b/src/frontend/app/administration/user/user-administration.component.ts index c8a40c7fbed..c7893c8de66 100755 --- a/src/frontend/app/administration/user/user-administration.component.ts +++ b/src/frontend/app/administration/user/user-administration.component.ts @@ -78,6 +78,7 @@ export class UserAdministrationComponent extends AutoCompletePlugin implements O displayedColumns = ['event_date', 'event_type', 'info', 'remote_ip']; dataSource = new MatTableDataSource(this.data); + selectedTabIndex : number = 0; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -706,6 +707,7 @@ export class UserAdministrationComponent extends AutoCompletePlugin implements O this.firstFormGroup.controls['newPasswordCtrl'].setErrors(null); this.firstFormGroup.controls['retypePasswordCtrl'].setErrors(null); this.showPassword = true; + this.selectedTabIndex = 0; } updatePassword() { -- GitLab