From 8eaa39fb5c1c1f6309b1b52c570cd1eb701eb8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr> Date: Wed, 26 Jan 2022 11:12:56 +0100 Subject: [PATCH] use api endpoint to fetch project-types instead of getter --- src/services/project-api.js | 14 ++++++++++++++ src/views/project/Project_type_list.vue | 22 ++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/services/project-api.js b/src/services/project-api.js index 8fd0655b..f150a81e 100644 --- a/src/services/project-api.js +++ b/src/services/project-api.js @@ -69,6 +69,20 @@ const projectAPI = { } }, + async getProjectTypes( baseUrl ) { + const response = await axios.get( + `${baseUrl}project-types/` + ); + if ( + response.status === 200 && + response.data + ) { + return response.data; + } else { + return null; + } + }, + async deleteProject(baseUrl, projectSlug) { const response = await axios.delete( `${baseUrl}projects/${projectSlug}/` diff --git a/src/views/project/Project_type_list.vue b/src/views/project/Project_type_list.vue index 17d64188..8e9fb588 100644 --- a/src/views/project/Project_type_list.vue +++ b/src/views/project/Project_type_list.vue @@ -32,8 +32,7 @@ {{ project.title }} </router-link> <p>{{ project.description }}</p> - <strong v-if="project.moderation">Projet modéré</strong> - <strong v-else>Projet non modéré</strong> + <strong>Projet {{ project.moderation ? '' : 'non' }} modéré</strong> </div> <div class="meta"> <span data-tooltip="Délai avant archivage"> @@ -71,16 +70,31 @@ </template> <script> -import { mapGetters } from 'vuex'; +import projectAPI from '@/services/project-api'; export default { name: 'ProjectTypeList', + data() { + return { + project_types: null, + }; + }, + computed: { - ...mapGetters(['project_types']), DJANGO_BASE_URL: function () { return this.$store.state.configuration.VUE_APP_DJANGO_BASE; }, + API_BASE_URL() { + return this.$store.state.configuration.VUE_APP_DJANGO_API_BASE; + }, + }, + + mounted() { + projectAPI.getProjectTypes(this.API_BASE_URL) + .then((data) => { + if (data) this.project_types = data; + }); }, methods: { -- GitLab