diff --git a/src/components/Feature/Detail/FeatureHeader.vue b/src/components/Feature/Detail/FeatureHeader.vue index fd328e6bd2b20718b88fd841a69cdf56c38ab5e3..33ee77d8f963eb168a7daaa0e761ff3f7ebe4150 100644 --- a/src/components/Feature/Detail/FeatureHeader.vue +++ b/src/components/Feature/Detail/FeatureHeader.vue @@ -21,7 +21,8 @@ v-else class="ellipsis" > - {{ currentFeature.properties.title || currentFeature.id }} + {{ currentFeature.properties ? + currentFeature.properties.title : currentFeature.id }} </div> <div diff --git a/src/components/Feature/Detail/FeatureTable.vue b/src/components/Feature/Detail/FeatureTable.vue index 7051d25ff1fc92ade59ac37d96428860a24805e3..66d12960dd68cc72df1f09d60b6c4a03edda0369 100644 --- a/src/components/Feature/Detail/FeatureTable.vue +++ b/src/components/Feature/Detail/FeatureTable.vue @@ -68,7 +68,7 @@ /> <FeatureEditStatusField v-if="fastEditionMode && canEditFeature && form" - :status="form.status.value" + :status="form.status.value.value || form.status.value" class="inline" /> <span v-else> diff --git a/src/store/modules/feature.store.js b/src/store/modules/feature.store.js index 6f0102605941cb07b671186d192834a77b768ccd..69b89cc3059e3f357064355f325a6d62f088ae3c 100644 --- a/src/store/modules/feature.store.js +++ b/src/store/modules/feature.store.js @@ -424,8 +424,11 @@ const feature = { const feature = state.currentFeature; const featureType = rootGetters['feature-type/feature_type']; function findCurrentValue(label) { - const field = feature.feature_data.find((el) => el.label === label); - return field ? field.value : null; + if (feature && feature.feature_data) { + const field = feature.feature_data.find((el) => el.label === label); + return field ? field.value : null; + } + return null; } if (featureType && featureType.customfield_set) { //* retrieve 'name', 'options', 'position' from current feature_type data to display in the form @@ -433,7 +436,8 @@ const feature = { return { ...field, //* add value field to extra forms from feature_type and existing values if feature is defined - value: feature.properties ? feature.properties[field.label] : findCurrentValue(field.label) || null + value: feature.properties ? + feature.properties[field.label] : findCurrentValue(field.label) || null }; }); commit('SET_EXTRA_FORMS', extraForm); diff --git a/src/views/Feature/FeatureDetail.vue b/src/views/Feature/FeatureDetail.vue index 11bbc97c565ad70ed0cdf51fe8a8c843ae939731..d128f31b52eebfb203e1fae94f79a3bc8401c869 100644 --- a/src/views/Feature/FeatureDetail.vue +++ b/src/views/Feature/FeatureDetail.vue @@ -444,7 +444,6 @@ export default { const url = `${this.$store.state.configuration.VUE_APP_DJANGO_API_BASE}projects/${this.$route.params.slug}/feature-paginated/?limit=1&${queryString}&output=geojson`; return featureAPI.getPaginatedFeatures(url) .then((data) => { - console.log(data); if (data && data.results && data.results.features && data.results.features[0]) { this.featuresCount = data.count; this.previous = data.previous;