From 51577494d856767c6272e111e2c89804d1177d12 Mon Sep 17 00:00:00 2001
From: "hamza.hramchi" <hamza.hramchi@xelians.fr>
Date: Fri, 16 Apr 2021 11:49:41 +0200
Subject: [PATCH] FEAT #16839 TIME 0:55 display password rules for user
administration
---
src/frontend/app/administration/user/user.component.html | 5 +++--
src/frontend/app/administration/user/user.component.ts | 6 ++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/frontend/app/administration/user/user.component.html b/src/frontend/app/administration/user/user.component.html
index 69ac193043..c9dfbb2f0c 100644
--- a/src/frontend/app/administration/user/user.component.html
+++ b/src/frontend/app/administration/user/user.component.html
@@ -72,6 +72,7 @@
<ion-input [type]="hideNewPassword ? 'password' : 'text'" name="newPasswordRest"
[(ngModel)]="passwordRest.newPassword" (ionChange)="checkPasswordValidity(passwordRest.newPassword)">
</ion-input>
+ <ion-note color="danger" *ngIf="this.handlePassword.error && passwordRest.newPassword.length > 0"> {{ this.handlePassword.errorMsg | translate}}</ion-note>
</ion-item>
<ion-item style="align-items: center;" *ngIf="user.isRest">
<ion-button slot="end" fill="clear" color="primary"
@@ -82,10 +83,10 @@
<ion-label color="secondary" position="floating">{{'lang.passwordConfirmation' | translate}}</ion-label>
<ion-input [type]="hideNewPasswordConfirm ? 'password' : 'text'" name="passwordConfirmation"
[(ngModel)]="passwordRest.passwordConfirmation"></ion-input>
- <ion-note color="danger" *ngIf="passwordRest.passwordConfirmation !== passwordRest.newPassword">
+ <ion-note color="danger" *ngIf="passwordRest.passwordConfirmation !== passwordRest.newPassword && passwordRest.passwordConfirmation.length > 0">
{{'lang.passwordNotMatch' | translate}}</ion-note>
<ion-note color="success"
- *ngIf="passwordRest.passwordConfirmation === passwordRest.newPassword && passwordRest.newPassword.length > 0 && passwordRest.passwordConfirmation.length> 0">
+ *ngIf="passwordRest.passwordConfirmation === passwordRest.newPassword && passwordRest.newPassword.length > 0 && passwordRest.passwordConfirmation.length> 0 && !this.handlePassword.error">
{{'lang.samePassword' | translate}}</ion-note>
</ion-item>
<ion-item text-center lines="none" style="position: sticky;bottom:0px;z-index:1;">
diff --git a/src/frontend/app/administration/user/user.component.ts b/src/frontend/app/administration/user/user.component.ts
index 0425767aa7..282a055112 100644
--- a/src/frontend/app/administration/user/user.component.ts
+++ b/src/frontend/app/administration/user/user.component.ts
@@ -113,7 +113,9 @@ export class UserComponent implements OnInit {
this.userClone = JSON.parse(JSON.stringify(this.user));
this.title = this.user.firstname + ' ' + this.user.lastname;
if (this.user.isRest) {
- this.getPassRules({ checked: true });
+ this.getPassRules({ detail: {
+ checked: true
+ } });
}
},
});
@@ -221,7 +223,7 @@ export class UserComponent implements OnInit {
}
getPassRules(ev: any) {
- if (ev.checked) {
+ if (ev.detail.checked) {
this.handlePassword.error = false;
this.handlePassword.errorMsg = '';
--
GitLab