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

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

parents 096e52db 3e8860aa
No related branches found
No related tags found
2 merge requests!2132.3.2-rc1,!204REDMINE_ISSUE-12672
...@@ -103,7 +103,8 @@ export default { ...@@ -103,7 +103,8 @@ export default {
feature_type: this.$route.params.feature_type_slug feature_type: this.$route.params.feature_type_slug
}); });
this.$store.dispatch('feature/GET_PROJECT_FEATURES', { this.$store.dispatch('feature/GET_PROJECT_FEATURES', {
project_slug: this.$route.params.slug project_slug: this.$route.params.slug,
feature_type__slug: this.$route.params.feature_type_slug
}) })
//* show that the action was triggered, could be improved with animation (doesn't work) //* show that the action was triggered, could be improved with animation (doesn't work)
this.ready = false; this.ready = false;
......
...@@ -298,7 +298,7 @@ export default { ...@@ -298,7 +298,7 @@ export default {
this.showImport = !this.showImport; this.showImport = !this.showImport;
if (this.showImport) { if (this.showImport) {
this.$store.dispatch("feature_type/GET_IMPORTS", { this.$store.dispatch("feature_type/GET_IMPORTS", {
feature_type: this.structure.slug feature_type: this.$route.params.feature_type_slug
}); });
} }
}, },
...@@ -411,7 +411,7 @@ export default { ...@@ -411,7 +411,7 @@ export default {
const response = await const response = await
this.$store.dispatch('feature/GET_PROJECT_FEATURES', { this.$store.dispatch('feature/GET_PROJECT_FEATURES', {
project_slug: this.$route.params.slug, project_slug: this.$route.params.slug,
feature_type__slug : this.structure.slug, feature_type__slug : this.$route.params.feature_type_slug,
ordering: '-created_on', ordering: '-created_on',
limit: '5' limit: '5'
}) })
...@@ -425,7 +425,7 @@ export default { ...@@ -425,7 +425,7 @@ export default {
'structure'(newValue){ 'structure'(newValue){
if (newValue.slug){ if (newValue.slug){
this.$store.dispatch("feature_type/GET_IMPORTS", { this.$store.dispatch("feature_type/GET_IMPORTS", {
feature_type: this.structure.slug feature_type: this.$route.params.feature_type_slug
}); });
} }
} }
......
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