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

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

parents 23d667a0 b0fd4ae1
No related branches found
No related tags found
No related merge requests found
...@@ -211,7 +211,6 @@ ...@@ -211,7 +211,6 @@
> >
<i class="inverted grey copy alternate icon"></i> <i class="inverted grey copy alternate icon"></i>
</router-link> </router-link>
{{isImporting(type)}}
<div <div
v-if="isImporting(type)" v-if="isImporting(type)"
class="import-message" class="import-message"
...@@ -258,8 +257,7 @@ ...@@ -258,8 +257,7 @@
type.geom_type === 'point' && type.geom_type === 'point' &&
permissions && permissions &&
permissions.can_create_feature_type && permissions.can_create_feature_type &&
isOffline() != true && isOffline() != true
!isImporting(type)
" "
class=" class="
ui ui
...@@ -685,7 +683,8 @@ export default { ...@@ -685,7 +683,8 @@ export default {
project_slug: this.$route.params.slug project_slug: this.$route.params.slug
}); });
}, this.$store.state.configuration.VUE_APP_RELOAD_INTERVAL)); }, this.$store.state.configuration.VUE_APP_RELOAD_INTERVAL));
} else if (newValue && !newValue.some(el => el.status === 'pending')) { } else if (newValue && !newValue.some(el => el.status === 'pending') && this.reloadIntervalId) {
this.GET_PROJECT_FEATURE_TYPES(this.project.slug);
this.CLEAR_RELOAD_INTERVAL_ID(); this.CLEAR_RELOAD_INTERVAL_ID();
} }
} }
...@@ -706,6 +705,9 @@ export default { ...@@ -706,6 +705,9 @@ export default {
...mapActions('feature', [ ...mapActions('feature', [
'GET_PROJECT_FEATURES' 'GET_PROJECT_FEATURES'
]), ]),
...mapActions('feature_type', [
'GET_PROJECT_FEATURE_TYPES'
]),
refreshId() { refreshId() {
return "?ver=" + Math.random(); return "?ver=" + Math.random();
}, },
......
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