aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r--client/src/app/+admin/overview/users/user-edit/user-edit.component.html2
-rw-r--r--client/src/app/+admin/overview/users/user-edit/user-password.component.ts6
2 files changed, 4 insertions, 4 deletions
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
index ecbcfe72f..278bd8c48 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
+++ b/client/src/app/+admin/overview/users/user-edit/user-edit.component.html
@@ -224,7 +224,7 @@
224 224
225 <div class="form-group"> 225 <div class="form-group">
226 <label i18n>Manually set the user password</label> 226 <label i18n>Manually set the user password</label>
227 <my-user-password [userId]="user.id"></my-user-password> 227 <my-user-password [userId]="user.id" [username]="user.username"></my-user-password>
228 </div> 228 </div>
229 229
230 <div *ngIf="user.twoFactorEnabled" class="form-group"> 230 <div *ngIf="user.twoFactorEnabled" class="form-group">
diff --git a/client/src/app/+admin/overview/users/user-edit/user-password.component.ts b/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
index d6616e077..ec93619f5 100644
--- a/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
+++ b/client/src/app/+admin/overview/users/user-edit/user-password.component.ts
@@ -11,12 +11,12 @@ import { UserUpdate } from '@shared/models'
11 styleUrls: [ './user-password.component.scss' ] 11 styleUrls: [ './user-password.component.scss' ]
12}) 12})
13export class UserPasswordComponent extends FormReactive implements OnInit { 13export class UserPasswordComponent extends FormReactive implements OnInit {
14 @Input() userId: number
15 @Input() username: string
16
14 error: string 17 error: string
15 username: string
16 showPassword = false 18 showPassword = false
17 19
18 @Input() userId: number
19
20 constructor ( 20 constructor (
21 protected formReactiveService: FormReactiveService, 21 protected formReactiveService: FormReactiveService,
22 private notifier: Notifier, 22 private notifier: Notifier,