Skip to content
Snippets Groups Projects
Commit f41f9ba0 authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'redmine-issues/12393' into 'develop'

REDMINE_ISSUE-12393

See merge request !137
parents 6d6b27d5 29c696ba
No related branches found
No related tags found
No related merge requests found
...@@ -120,6 +120,7 @@ const feature = { ...@@ -120,6 +120,7 @@ const feature = {
const message = routeName === "editer-signalement" ? "Le signalement a été mis à jour" : "Le signalement a été crée"; const message = routeName === "editer-signalement" ? "Le signalement a été mis à jour" : "Le signalement a été crée";
function redirect(featureId) { function redirect(featureId) {
dispatch("GET_PROJECT_FEATURES", rootState.project_slug)
commit("DISCARD_LOADER", null, { root: true }) commit("DISCARD_LOADER", null, { root: true })
router.push({ router.push({
name: "details-signalement", name: "details-signalement",
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
<router-link <router-link
v-if=" v-if="
(permissions && permissions.can_update_feature) || (permissions && permissions.can_update_feature) ||
isFeatureCreator isFeatureCreator ||
isModerator
" "
:to="{ :to="{
name: 'editer-signalement', name: 'editer-signalement',
...@@ -39,7 +40,9 @@ ...@@ -39,7 +40,9 @@
</router-link> </router-link>
<!-- (permissions && permissions.can_delete_feature) || --> <!-- (permissions && permissions.can_delete_feature) || -->
<a <a
v-if="isFeatureCreator || permissions.is_project_super_contributor" v-if="
isFeatureCreator || permissions.is_project_super_contributor
"
@click="isCanceling = true" @click="isCanceling = true"
id="feature-delete" id="feature-delete"
class="ui button button-hover-red" class="ui button button-hover-red"
...@@ -386,14 +389,14 @@ export default { ...@@ -386,14 +389,14 @@ export default {
}, },
computed: { computed: {
...mapState(["user"]), ...mapState(["user", "USER_LEVEL_PROJECTS"]),
...mapGetters(["permissions"]), ...mapGetters(["permissions", "project"]),
...mapState("feature", ["linked_features", "statusChoices"]), ...mapState("feature", ["linked_features", "statusChoices"]),
DJANGO_BASE_URL: function () { DJANGO_BASE_URL() {
return this.$store.state.configuration.VUE_APP_DJANGO_BASE; return this.$store.state.configuration.VUE_APP_DJANGO_BASE;
}, },
feature: function () { feature() {
const result = this.$store.state.feature.features.find( const result = this.$store.state.feature.features.find(
(el) => el.feature_id === this.$route.params.slug_signal (el) => el.feature_id === this.$route.params.slug_signal
); );
...@@ -407,6 +410,13 @@ export default { ...@@ -407,6 +410,13 @@ export default {
return false; return false;
}, },
isModerator() {
return this.USER_LEVEL_PROJECTS &&
this.USER_LEVEL_PROJECTS[this.project.slug] === "Modérateur"
? true
: false;
},
statusIcon() { statusIcon() {
switch (this.feature.status) { switch (this.feature.status) {
case "archived": case "archived":
...@@ -617,7 +627,12 @@ export default { ...@@ -617,7 +627,12 @@ export default {
const feature = response.data; const feature = response.data;
if (feature) { if (feature) {
const currentFeature = [feature]; const currentFeature = [feature];
const featureGroup = mapUtil.addFeatures(currentFeature,{},true,this.$store.state.feature_type.feature_types); const featureGroup = mapUtil.addFeatures(
currentFeature,
{},
true,
this.$store.state.feature_type.feature_types
);
mapUtil mapUtil
.getMap() .getMap()
.fitBounds(featureGroup.getBounds(), { padding: [25, 25] }); .fitBounds(featureGroup.getBounds(), { padding: [25, 25] });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment