From c5bf5c84cdd766ea8dd09c23f65f81bca9c89042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr> Date: Mon, 10 Jan 2022 10:17:43 +0100 Subject: [PATCH] make idgo catalog button configurable --- public/config/config.json | 1 + src/views/feature_type/Feature_type_detail.vue | 8 +++++++- src/views/project/Project_detail.vue | 12 +++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/public/config/config.json b/public/config/config.json index 9651190e..59d53731 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -9,6 +9,7 @@ "VUE_APP_LOGO_PATH":"/geocontrib/img/logo-neogeo-circle.png", "VUE_APP_DJANGO_BASE":"http://localhost:8010", "VUE_APP_DJANGO_API_BASE":"http://localhost:8010/api/", + "VUE_APP_CATALOG_NAME": "Datasud", "VUE_APP_RELOAD_INTERVAL": 15000, "VUE_APP_DISABLE_LOGIN_BUTTON":false, "VUE_APP_LOGIN_URL":"", diff --git a/src/views/feature_type/Feature_type_detail.vue b/src/views/feature_type/Feature_type_detail.vue index bae93743..a6e22d3f 100644 --- a/src/views/feature_type/Feature_type_detail.vue +++ b/src/views/feature_type/Feature_type_detail.vue @@ -99,7 +99,7 @@ }, }" class="ui icon button import-catalog" - >Créer un nouveau type de signalement à partir du catalogue Datasud + >Créer un nouveau type de signalement à partir du catalogue {{ CATALOG_NAME|| 'IDGO'}} </router-link> <div v-if="$route.params.geojson" class="ui button import-catalog basic active teal"> Ressource {{$route.params.geojson.name}} @@ -285,10 +285,16 @@ export default { 'features', 'features_count' ]), + ...mapState([ + 'configuration', + ]), ...mapState('feature_type', [ 'feature_types', 'importFeatureTypeData' ]), + CATALOG_NAME() { + return this.configuration.VUE_APP_CATALOG_NAME; + }, structure: function () { if (Object.keys(this.feature_types).length) { let st = this.feature_types.find( diff --git a/src/views/project/Project_detail.vue b/src/views/project/Project_detail.vue index 419469b6..3cff2db3 100644 --- a/src/views/project/Project_detail.vue +++ b/src/views/project/Project_detail.vue @@ -340,7 +340,7 @@ }" class="ui compact basic button button-hover-green button-align-left" > - <i class="ui plus icon"></i>Créer un nouveau type de signalement à partir du catalogue Datasud + <i class="ui plus icon"></i>Créer un nouveau type de signalement à partir du catalogue {{ CATALOG_NAME|| 'IDGO'}} </router-link> </div> @@ -673,6 +673,9 @@ export default { 'project', 'permissions' ]), + ...mapState([ + 'configuration', + ]), ...mapState('feature_type', [ 'feature_types', 'importFeatureTypeData' @@ -689,10 +692,13 @@ export default { 'map' ]), DJANGO_BASE_URL() { - return this.$store.state.configuration.VUE_APP_DJANGO_BASE; + return this.configuration.VUE_APP_DJANGO_BASE; }, API_BASE_URL() { - return this.$store.state.configuration.VUE_APP_DJANGO_API_BASE; + return this.configuration.VUE_APP_DJANGO_API_BASE; + }, + CATALOG_NAME() { + return this.configuration.VUE_APP_CATALOG_NAME; }, fileSize() { return fileConvertSizeToMo(this.fileToImport.size); -- GitLab