From 6126eb889c933e3ca6c239dadb7dd34d0bd0e5d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Mon, 27 Sep 2021 15:50:40 +0200
Subject: [PATCH] fix static pages after redirection from login and redirect
after logout only for admin right restricted pages
---
src/store/index.js | 3 ++-
src/views/flatpages/Default.vue | 11 +++++++----
src/views/flatpages/with_right_menu.vue | 11 ++++++++---
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/store/index.js b/src/store/index.js
index 64791f0a..225a436b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -179,6 +179,7 @@ export default new Vuex.Store({
},
LOGOUT({ commit }) {
+ const pageNoRedirect = ["liste-signalements", "details-type-signalement", "details-signalement", "project_detail", "mentions", "aide", "index"]
axios
.get(`${this.state.configuration.VUE_APP_DJANGO_API_BASE}logout/`)
.then((response) => {
@@ -186,7 +187,7 @@ export default new Vuex.Store({
commit("SET_USER", false);
commit("SET_USER_LEVEL_PROJECTS", null);
commit("SET_USER_PERMISSIONS", null);
- router.push("/");
+ if (!pageNoRedirect.includes(router.history.current.name)) router.push("/");
}
})
.catch((error) => {
diff --git a/src/views/flatpages/Default.vue b/src/views/flatpages/Default.vue
index af382968..9c844381 100644
--- a/src/views/flatpages/Default.vue
+++ b/src/views/flatpages/Default.vue
@@ -1,7 +1,6 @@
<template>
<div v-if="flatpage" class="row">
<div class="ten wide column">
- {{ this.$route.params.url }}
<h1>{{ flatpage.title }}</h1>
<div v-html="flatpage.content"></div>
</div>
@@ -9,13 +8,17 @@
</template>
<script>
+import { mapState } from "vuex";
+
export default {
name: "Default",
+
computed: {
+ ...mapState(["staticPages"]),
flatpage() {
- if (this.$store.state.staticPages) {
- return this.$store.state.staticPages.find(
- (page) => page.url === this.$route.path
+ if (this.staticPages) {
+ return this.staticPages.find(
+ (page) => page.url === `/${this.$route.name}/`
);
}
return null;
diff --git a/src/views/flatpages/with_right_menu.vue b/src/views/flatpages/with_right_menu.vue
index 64578960..c04a20b3 100644
--- a/src/views/flatpages/with_right_menu.vue
+++ b/src/views/flatpages/with_right_menu.vue
@@ -23,18 +23,23 @@
</template>
<script>
+import { mapState } from "vuex";
+
export default {
name: "With_right_menu",
+
data() {
return {
sections: [],
};
},
+
computed: {
+ ...mapState(["staticPages"]),
flatpage() {
- if (this.$store.state.staticPages) {
- return this.$store.state.staticPages.find(
- (page) => page.url === this.$route.path
+ if (this.staticPages) {
+ return this.staticPages.find(
+ (page) => page.url === `/${this.$route.name}/`
);
}
return null;
--
GitLab