From 9aebdc09c544d24e7dc5f9f939c6aaef5da4f2a1 Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Wed, 11 Jul 2018 16:18:51 +0200 Subject: [PATCH] FIX #7659 change redirect to home page after password changed --- .../js/angular/app/password-modification.component.ts | 4 ++-- apps/maarch_entreprise/js/angular/lang/lang-en.ts | 2 +- apps/maarch_entreprise/js/angular/lang/lang-fr.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/maarch_entreprise/js/angular/app/password-modification.component.ts b/apps/maarch_entreprise/js/angular/app/password-modification.component.ts index a2e1574d47e..b4693e0f337 100644 --- a/apps/maarch_entreprise/js/angular/app/password-modification.component.ts +++ b/apps/maarch_entreprise/js/angular/app/password-modification.component.ts @@ -225,7 +225,7 @@ export class InfoChangePasswordModalComponent { constructor(public http: HttpClient, @Inject(MAT_DIALOG_DATA) public data: any, public dialogRef: MatDialogRef<InfoChangePasswordModalComponent>) { } - logout() { - location.href = "index.php?display=true&page=logout&logout=true"; + redirect() { + location.href = "index.php"; } } diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts index 7ba64a34912..13099d211d2 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts @@ -570,7 +570,7 @@ export const LANG_EN = { "passwordValid" : "Password is valid", "passwordMatch" : "These passwords match", "passwordNotMatch" : "These passwords don't match", - "reconnect" : "Reconnect", + "homePage" : "Home page", "passwordChanged" : "Your password has changed", "typeCurrentPassword" : "Type your current password", "typeNewPassword" : "Type a new password", diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts index 26fa82ca6b2..0bac8f28591 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts @@ -592,7 +592,7 @@ export const LANG_FR = { "passwordValid" : "Mot de passe conforme", "passwordMatch" : "Les mots de passe sont identiques", "passwordNotMatch" : "Les mots de passe ne correspondent pas", - "reconnect" : "Se re-connecter", + "homePage" : "Page d'accueil", "passwordChanged" : "Votre mot de passe a été changé", "typeCurrentPassword" : "Entrez votre mot de passe actuel", "typeNewPassword" : "Entrez un nouveau mot de passe", -- GitLab