diff --git a/src/components/feature/FeatureListTable.vue b/src/components/feature/FeatureListTable.vue index d0a0ad5a90ac960398790d161f4b7dae86dbae5b..f55bbaa9a1e6d61b7f55cc4eb75666ce55000763 100644 --- a/src/components/feature/FeatureListTable.vue +++ b/src/components/feature/FeatureListTable.vue @@ -143,25 +143,25 @@ <td class="dt-center"> <div - v-if="feature.properties.status.value === 'archived'" + v-if="feature.status === 'archived'" data-tooltip="Archivé" > <i class="grey archive icon" /> </div> <div - v-else-if="feature.properties.status.value === 'pending'" + v-else-if="feature.status === 'pending'" data-tooltip="En attente de publication" > <i class="teal hourglass outline icon" /> </div> <div - v-else-if="feature.properties.status.value === 'published'" + v-else-if="feature.status === 'published'" data-tooltip="Publié" > <i class="olive check icon" /> </div> <div - v-else-if="feature.properties.status.value === 'draft'" + v-else-if="feature.status === 'draft'" data-tooltip="Brouillon" > <i class="orange pencil alternate icon" /> @@ -172,11 +172,11 @@ :to="{ name: 'details-type-signalement', params: { - feature_type_slug: feature.properties.feature_type.slug, + feature_type_slug: feature.feature_type.slug, }, }" > - {{ feature.properties.feature_type.title }} + {{ feature.feature_type.title }} </router-link> </td> <td class="dt-center"> @@ -184,8 +184,8 @@ :to="{ name: 'details-signalement', params: { - slug_type_signal: feature.properties.feature_type.slug, - slug_signal: feature.properties.slug || feature.id, + slug_type_signal: feature.feature_type.slug, + slug_signal: feature.slug || feature.id, }, }" > @@ -193,7 +193,7 @@ </router-link> </td> <td class="dt-center"> - {{ feature.properties.updated_on }} + {{ feature.updated_on }} </td> <td v-if="user" @@ -205,7 +205,7 @@ v-if="user" class="dt-center" > - {{ feature.properties.display_last_editor }} + {{ feature.display_last_editor }} </td> </tr> <tr @@ -401,13 +401,13 @@ export default { methods: { storeClickedFeature(feature) { - this.$emit('update:clickedFeatures', [...this.clickedFeatures, { feature_id: feature.id, feature_type: feature.properties.feature_type.slug }]); + this.$emit('update:clickedFeatures', [...this.clickedFeatures, { feature_id: feature.id, feature_type: feature.feature_type.slug }]); }, canDeleteFeature(feature) { if (this.userStatus === 'Administrateur projet') return true; //* can delete all //* others can delete only their own features - return feature.properties.creator.username === this.user.username; + return feature.creator.username === this.user.username; }, canEditFeature(feature) { @@ -418,10 +418,10 @@ export default { Contributeur : ['draft', 'pending', 'published'], }; - if (this.userStatus === 'Contributeur' && feature.properties.creator.username !== this.user.username) { + if (this.userStatus === 'Contributeur' && feature.creator.username !== this.user.username) { return false; } else if (permissions[this.userStatus]) { - return permissions[this.userStatus].includes(feature.properties.status.value); + return permissions[this.userStatus].includes(feature.status.value); } else { return false; } @@ -443,13 +443,13 @@ export default { }, getUserName(feature) { - if (!feature.properties.creator) { + if (!feature.creator) { return ' ---- '; } - return feature.properties.creator.username || ' ---- '; + return feature.creator.username || ' ---- '; }, getFeatureDisplayName(feature) { - return feature.properties.title || feature.id; + return feature.title || feature.id; }, isSortedAsc(column) { diff --git a/src/views/feature/Feature_list.vue b/src/views/feature/Feature_list.vue index e6ea867becfa9da8c58c89f7e112ded3695572c9..c320d8a966b985ccad6dc133f428e798fdb0d02e 100644 --- a/src/views/feature/Feature_list.vue +++ b/src/views/feature/Feature_list.vue @@ -587,7 +587,7 @@ export default { }, fetchPagedFeatures(newUrl) { - let url = `${this.API_BASE_URL}projects/${this.projectSlug}/feature-paginated/?output=geojson&limit=${this.pagination.pagesize}&offset=${this.pagination.start}`; + let url = `${this.API_BASE_URL}projects/${this.projectSlug}/feature-paginated/?limit=${this.pagination.pagesize}&offset=${this.pagination.start}`; //* if receiving next & previous url if (newUrl && typeof newUrl === 'string') { //newUrl = newUrl.replace("8000", "8010"); //* for dev uncomment to use proxy link @@ -606,8 +606,9 @@ export default { this.featuresCount = data.count; this.previous = data.previous; this.next = data.next; - this.paginatedFeatures = data.results.features; + this.paginatedFeatures = data.results; } + console.log('paginatedFeatures', this.paginatedFeatures); //* bbox needs to be updated with the same filters if (this.paginatedFeatures.length) { this.fetchBboxNfit(queryString);