From 74ff7b114ef998cc59bef8360d8105d5e2d18e01 Mon Sep 17 00:00:00 2001
From: Matthieu Benoist <mbenoist@ausy-group.com>
Date: Mon, 27 Jul 2020 14:28:01 +0200
Subject: [PATCH] Fix the CGU redirect for datasets without Data tab
---
src/app/shared/components/cgu-modal/cgu-modal.component.ts | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/app/shared/components/cgu-modal/cgu-modal.component.ts b/src/app/shared/components/cgu-modal/cgu-modal.component.ts
index 40ff1c5b..31dc0923 100644
--- a/src/app/shared/components/cgu-modal/cgu-modal.component.ts
+++ b/src/app/shared/components/cgu-modal/cgu-modal.component.ts
@@ -7,6 +7,7 @@ import { CMSContent } from '../../../editorialisation/models';
import { EditorialisationService } from '../../../editorialisation/services';
import { AppRoutes } from '../../../routes';
import { UserService } from '../../../user/services';
+import { DatasetDetailService } from '../../../dataset-detail/services';
@Component({
selector: 'app-cgu-modal',
@@ -31,6 +32,7 @@ export class CguModalComponent implements OnInit {
private _route: ActivatedRoute,
private _cookieService: CookieService,
private _userService: UserService,
+ private _datasetDetailService: DatasetDetailService,
) { }
ngOnInit() {
@@ -49,7 +51,8 @@ export class CguModalComponent implements OnInit {
closeCguModal() {
this.cguModalIsOpened = false;
- this._router.navigate([`../${AppRoutes.data.uri}`], { relativeTo: this._route });
+ const mRoute = (this._datasetDetailService.dataset.hasMap || this._datasetDetailService.dataset.hasTable ? AppRoutes.data.uri : AppRoutes.info.uri);
+ this._router.navigate([`../${mRoute}`], { relativeTo: this._route });
}
acceptCgu() {
--
GitLab