Skip to content
Snippets Groups Projects
Merged Timothee P requested to merge redmine-issues/12870 into develop
2 files
+ 20
19
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -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) {
Loading