From 7232a21ad41fffd63272b3bec7afe49f961fba53 Mon Sep 17 00:00:00 2001
From: Antonin Coquet <ext.sopra.acoquet@grandlyon.com>
Date: Tue, 13 Apr 2021 15:23:49 +0200
Subject: [PATCH 1/2] redirection on login now to acteurs
---
.../shared/components/signup-modal/signup-modal.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/shared/components/signup-modal/signup-modal.component.ts b/src/app/shared/components/signup-modal/signup-modal.component.ts
index 128646d1b..1ea02ace1 100644
--- a/src/app/shared/components/signup-modal/signup-modal.component.ts
+++ b/src/app/shared/components/signup-modal/signup-modal.component.ts
@@ -33,7 +33,7 @@ export class SignUpModalComponent implements OnInit {
password: ['', [Validators.required, Validators.pattern(CustomRegExp.PASSWORD)]],
});
// get return url from route parameters or default to '/'
- this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/';
+ this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/acteurs';
}
// getter for form fields
--
GitLab
From 3e259fb09f8a8f57571aa9cbcebbf8e2cb7fce2f Mon Sep 17 00:00:00 2001
From: Antonin Coquet <ext.sopra.acoquet@grandlyon.com>
Date: Wed, 14 Apr 2021 17:06:16 +0200
Subject: [PATCH 2/2] fix: change login redirection
---
.../shared/components/signup-modal/signup-modal.component.ts | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/app/shared/components/signup-modal/signup-modal.component.ts b/src/app/shared/components/signup-modal/signup-modal.component.ts
index 1ea02ace1..1ca87953b 100644
--- a/src/app/shared/components/signup-modal/signup-modal.component.ts
+++ b/src/app/shared/components/signup-modal/signup-modal.component.ts
@@ -15,7 +15,6 @@ export class SignUpModalComponent implements OnInit {
public loading = false;
public submitted = false;
public authFailed = false;
- public returnUrl: string;
public isShowPassword = false;
constructor(
private formBuilder: FormBuilder,
@@ -32,8 +31,6 @@ export class SignUpModalComponent implements OnInit {
email: ['', [Validators.required, Validators.pattern(CustomRegExp.EMAIL)]],
password: ['', [Validators.required, Validators.pattern(CustomRegExp.PASSWORD)]],
});
- // get return url from route parameters or default to '/'
- this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/acteurs';
}
// getter for form fields
@@ -68,7 +65,7 @@ export class SignUpModalComponent implements OnInit {
.pipe(first())
.subscribe(
() => {
- this.router.navigate([this.returnUrl]);
+ this.router.navigate([this.router.url]);
this.closeModal();
},
() => {
--
GitLab