Browse Source

Fix for password validator.

release/2.x
Sebastian Stehle 7 years ago
parent
commit
17ec289277
  1. 2
      src/Squidex/app/features/administration/pages/users/user-page.component.ts
  2. 12
      src/Squidex/app/features/administration/state/users.forms.ts

2
src/Squidex/app/features/administration/pages/users/user-page.component.ts

@ -24,8 +24,6 @@ import {
templateUrl: './user-page.component.html'
})
export class UserPageComponent extends ResourceOwner implements OnInit {
public canUpdate = false;
public user?: { user: UserDto, isCurrentUser: boolean };
public userForm = new UserForm(this.formBuilder);

12
src/Squidex/app/features/administration/state/users.forms.ts

@ -24,7 +24,7 @@ export class UserForm extends Form<FormGroup, UpdateUserDto> {
],
password: ['',
[
Validators.nullValidator
Validators.required
]
],
passwordConfirm: ['',
@ -36,6 +36,16 @@ export class UserForm extends Form<FormGroup, UpdateUserDto> {
}));
}
public load(value: any) {
if (value) {
this.form.controls['password'].setValidators(Validators.nullValidator);
} else {
this.form.controls['password'].setValidators(Validators.required);
}
super.load(value);
}
protected transformLoad(user: UpdateUserDto) {
return { ...user, permissions: user.permissions.join('\n') };
}

Loading…
Cancel
Save