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

Merge branch 'REDMINE-ISSUES/12588' into 'develop'

parents 58fde623 df36c46c
No related branches found
No related tags found
No related merge requests found
......@@ -16,6 +16,7 @@ const feature = {
checkedFeatures: [],
extra_form: [],
features: [],
features_count: 0,
current_feature: [],
form: null,
linkedFormset: [],
......@@ -43,6 +44,9 @@ const feature = {
SET_FEATURES(state, features) {
state.features = features;
},
SET_FEATURES_COUNT(state, features_count) {
state.features_count = features_count;
},
SET_CURRENT_FEATURE(state, feature) {
state.current_feature = feature;
},
......@@ -116,6 +120,7 @@ const feature = {
const cancelToken = axios.CancelToken.source();
commit('SET_CANCELLABLE_SEARCH_REQUEST', cancelToken, { root: true });
commit("SET_FEATURES", []);
commit("SET_FEATURES_COUNT", 0);
let url = `${rootState.configuration.VUE_APP_DJANGO_API_BASE}projects/${project_slug}/feature/`;
if (feature_type__slug) {
url = url.concat('', `${url.includes('?') ? '&' : '?'}feature_type__slug=${feature_type__slug}`);
......@@ -132,6 +137,8 @@ const feature = {
if (response.status === 200 && response.data) {
const features = response.data.features;
commit("SET_FEATURES", features);
const features_count = response.data.count;
commit("SET_FEATURES_COUNT", features_count);
//dispatch("map/ADD_FEATURES", null, { root: true }); //todo: should check if map was initiated
}
return response;
......
......@@ -33,7 +33,7 @@
</div>
</div>
<div class="value">
{{ feature_type_features.length }}
{{ features_count }}
</div>
<div class="label">
Signalement{{ features.length > 1 ? "s" : "" }}
......@@ -250,7 +250,7 @@ export default {
computed: {
...mapGetters(["project", "permissions"]),
...mapState("feature", ["features"]),
...mapState("feature", ["features", "features_count"]),
...mapState("feature_type", ["feature_types", "importFeatureTypeData"]),
structure: function () {
if (this.feature_types) {
......@@ -380,7 +380,8 @@ export default {
async setCurrentFeatureTypeSlug(){
const response = await
this.$store.dispatch('feature/GET_PROJECT_FEATURES', {
project_slug: this.$route.params.slug
project_slug: this.$route.params.slug,
limit: '5'
})
console.log(response)
......
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