diff --git a/src/components/feature/FeatureListTable.vue b/src/components/feature/FeatureListTable.vue
index 565c4969e0de717740cba95e89c919f05c7559d2..8c2f327e420bfe0f32993a7f433bae8dbae792cf 100644
--- a/src/components/feature/FeatureListTable.vue
+++ b/src/components/feature/FeatureListTable.vue
@@ -125,10 +125,10 @@
:class="['ui checkbox', {disabled: !checkRights(feature)}]"
>
<input
- :id="feature.id"
+ :id="feature.feature_id"
v-model="checked"
type="checkbox"
- :value="feature.id"
+ :value="feature.feature_id"
:disabled="!checkRights(feature)"
name="select"
@input="storeClickedFeature(feature)"
@@ -138,25 +138,29 @@
</td>
<td class="dt-center">
- <div v-if="feature.properties.status.value === 'archived'">
- <span data-tooltip="Archivé">
- <i class="grey archive icon" />
- </span>
+ <div
+ v-if="feature.status === 'archived'"
+ data-tooltip="Archivé"
+ >
+ <i class="grey archive icon" />
</div>
- <div v-else-if="feature.properties.status.value === 'pending'">
- <span data-tooltip="En attente de publication">
- <i class="teal hourglass outline icon" />
- </span>
+ <div
+ 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'">
- <span data-tooltip="Publié">
- <i class="olive check icon" />
- </span>
+ <div
+ v-else-if="feature.status === 'published'"
+ data-tooltip="Publié"
+ >
+ <i class="olive check icon" />
</div>
- <div v-else-if="feature.properties.status.value === 'draft'">
- <span data-tooltip="Brouillon">
- <i class="orange pencil alternate icon" />
- </span>
+ <div
+ v-else-if="feature.status === 'draft'"
+ data-tooltip="Brouillon"
+ >
+ <i class="orange pencil alternate icon" />
</div>
</td>
<td class="dt-center">
@@ -164,11 +168,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">
@@ -176,178 +180,28 @@
: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.feature_id,
},
}"
-<<<<<<< HEAD
- class="icon sort"
- />
- </div>
- </th>
- </tr>
- </thead>
- <tbody>
- <tr
- v-for="(feature, index) in paginatedFeatures"
- :key="index"
- >
- <td class="dt-center">
- <div
- :class="['ui checkbox', {disabled: !checkRights(feature)}]"
- >
- <input
- :id="feature.feature_id"
- v-model="checked"
- type="checkbox"
- :value="feature.feature_id"
- :disabled="!checkRights(feature)"
- name="select"
- @input="storeClickedFeature(feature)"
- >
- <label for="select" />
- </div>
- </td>
-
- <td class="dt-center">
- <div
- v-if="feature.status === 'archived'"
- data-tooltip="Archivé"
- >
- <i class="grey archive icon" />
- </div>
- <div
- v-else-if="feature.status === 'pending'"
- data-tooltip="En attente de publication"
- >
- <i class="teal hourglass outline icon" />
- </div>
- <div
- v-else-if="feature.status === 'published'"
- data-tooltip="Publié"
- >
- <i class="olive check icon" />
- </div>
- <div
- v-else-if="feature.status === 'draft'"
- data-tooltip="Brouillon"
- >
- <i class="orange pencil alternate icon" />
- </div>
- </td>
- <td class="dt-center">
- <router-link
- :to="{
- name: 'details-type-signalement',
- params: {
- feature_type_slug: feature.feature_type.slug,
- },
- }"
- >
- {{ feature.feature_type.title }}
- </router-link>
- </td>
- <td class="dt-center">
- <router-link
- :to="{
- name: 'details-signalement',
- params: {
- slug_type_signal: feature.feature_type.slug,
- slug_signal: feature.slug || feature.feature_id,
- },
- }"
- >
- {{ feature.title || feature.feature_id }}
- </router-link>
- </td>
- <td class="dt-center">
- {{ feature.updated_on | formatDate }}
- </td>
- <td
- v-if="user"
- class="dt-center"
- >
- {{ feature.display_creator || ' ---- ' }}
- </td>
- <td
- v-if="user"
- class="dt-center"
- >
- {{ feature.display_last_editor || ' ---- ' }}
- </td>
- </tr>
- <tr
- v-if="featuresCount === 0"
- class="odd"
- >
- <td
- colspan="5"
- class="dataTables_empty"
- valign="top"
- >
- Aucune donnée disponible
- </td>
- </tr>
- </tbody>
- </table>
- <div
- v-if="pageNumbers.length > 1"
- id="table-features_info"
- class="dataTables_info"
- role="status"
- aria-live="polite"
- >
- Affichage de l'élément {{ pagination.start + 1 }} Ã
- {{ displayedPageEnd }}
- sur {{ featuresCount }} éléments
- </div>
- <div
- v-if="pageNumbers.length > 1"
- id="table-features_paginate"
- class="dataTables_paginate paging_simple_numbers"
- >
- <a
- id="table-features_previous"
- :class="[
- 'paginate_button previous',
- { disabled: pagination.currentPage === 1 },
- ]"
- aria-controls="table-features"
- data-dt-idx="0"
- tabindex="0"
- @click="$emit('update:page', 'previous')"
- >Précédent</a>
- <span>
- <span v-if="pagination.currentPage >= 5">
- <a
- key="page1"
- class="paginate_button"
- aria-controls="table-features"
- data-dt-idx="1"
- tabindex="0"
- @click="$emit('update:page', 1)"
- >{{ 1 }}</a>
- <span class="ellipsis">…</span>
- </span>
-=======
>
- {{ getFeatureDisplayName(feature) }}
+ {{ feature.title || feature.feature_id }}
</router-link>
</td>
<td class="dt-center">
- {{ feature.properties.updated_on }}
+ {{ feature.updated_on | formatDate }}
</td>
<td
v-if="user"
class="dt-center"
>
- {{ getUserName(feature) }}
+ {{ feature.display_creator || ' ---- ' }}
</td>
<td
v-if="user"
class="dt-center"
>
- {{ feature.properties.display_last_editor }}
+ {{ feature.display_last_editor || ' ---- ' }}
</td>
</tr>
<tr
@@ -380,7 +234,6 @@
id="table-features_paginate"
class="dataTables_paginate paging_simple_numbers"
>
->>>>>>> develop
<a
id="table-features_previous"
:class="[
@@ -447,8 +300,6 @@
<script>
import { mapState, mapGetters, mapMutations } from 'vuex';
import FeatureListMassToggle from '@/components/feature/FeatureListMassToggle';
-
-import { mapState, mapGetters } from 'vuex';
import { formatStringDate } from '@/utils';
export default {
@@ -458,7 +309,8 @@ export default {
formatDate(value) {
return formatStringDate(value);
},
-
+ },
+
components: {
FeatureListMassToggle,
},
@@ -587,21 +439,10 @@ export default {
}
},
-<<<<<<< HEAD
switchMode() {
this.$emit('update:mode', this.mode === 'modify' ? 'delete' : 'modify');
- this.$emit('update:clickedFeatures', []);
+ this.UPDATE_CLICKED_FEATURES([]);
this.$store.commit('feature/UPDATE_CHECKED_FEATURES', []);
-=======
- getUserName(feature) {
- if (!feature.properties.creator) {
- return ' ---- ';
- }
- return feature.properties.creator.username || ' ---- ';
- },
- getFeatureDisplayName(feature) {
- return feature.properties.title || feature.id;
->>>>>>> develop
},
isSortedAsc(column) {