Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
web-app
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
web-et-numerique-internet
data.grandlyon.com
web-portal
components
custom-apps
web-app
Commits
74ff7b11
Commit
74ff7b11
authored
4 years ago
by
Matthieu Benoist
Browse files
Options
Downloads
Patches
Plain Diff
Fix the CGU redirect for datasets without Data tab
parent
4e7b0c8f
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!75
Fixes for some CGU popin and WS tab problems
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/shared/components/cgu-modal/cgu-modal.component.ts
+4
-1
4 additions, 1 deletion
src/app/shared/components/cgu-modal/cgu-modal.component.ts
with
4 additions
and
1 deletion
src/app/shared/components/cgu-modal/cgu-modal.component.ts
+
4
−
1
View file @
74ff7b11
...
...
@@ -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
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment