summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/lib/sequelize.js3
-rw-r--r--webapp/src/components/GroupModule.vue10
-rw-r--r--webapp/src/components/LoadingBar.vue21
3 files changed, 21 insertions, 13 deletions
diff --git a/server/lib/sequelize.js b/server/lib/sequelize.js
index b6b99dd..5c22bff 100644
--- a/server/lib/sequelize.js
+++ b/server/lib/sequelize.js
@@ -10,7 +10,8 @@ var db = {}
var sequelize = new Sequelize(config.database, config.username, config.password, {
host: config.host,
dialect: config.dialect,
- operatorsAliases: false
+ operatorsAliases: false,
+ logging: false
})
const Op = Sequelize.Op
diff --git a/webapp/src/components/GroupModule.vue b/webapp/src/components/GroupModule.vue
index 36d6fcb..4630824 100644
--- a/webapp/src/components/GroupModule.vue
+++ b/webapp/src/components/GroupModule.vue
@@ -93,9 +93,13 @@ export default {
}
},
created () {
- this.$store.dispatch('groups/loadConfigs')
- this.$store.dispatch('groups/loadLists')
- if (this.tabChain.length === 0) this.$store.dispatch('groups/loadGroup', { id: 0, tabIndex: 0 })
+ if (this.tabChain.length === 0) {
+ this.$store.dispatch('groups/loadGroup', { id: 0, tabIndex: 0 })
+ this.$store.dispatch('groups/loadConfigs')
+ this.$store.dispatch('groups/loadLists')
+ } else {
+ this.reload()
+ }
if (this.$route.params.id !== '0') this.loadItem(this.$route.name, this.$route.params.id)
this.$router.replace({
name: 'GroupModule.' + this.tabChain[this.activeTab].tabType,
diff --git a/webapp/src/components/LoadingBar.vue b/webapp/src/components/LoadingBar.vue
index 32495ef..342b638 100644
--- a/webapp/src/components/LoadingBar.vue
+++ b/webapp/src/components/LoadingBar.vue
@@ -37,15 +37,18 @@ export default {
}
},
watch: {
- loading (value) {
- clearTimeout(this.loadingTimeout)
- if (value) {
- this.loadingValue = 0
- this.loadingBar = true
- this.loadingTimeout = setTimeout(this.increaseLoadingValue, 10)
- } else {
- this.loadingValue = 100
- this.loadingTimeout = setTimeout(() => { this.loadingBar = false }, 500)
+ loading: {
+ immediate: true,
+ handler (value) {
+ clearTimeout(this.loadingTimeout)
+ if (value) {
+ this.loadingValue = 0
+ this.loadingBar = true
+ this.loadingTimeout = setTimeout(this.increaseLoadingValue, 10)
+ } else {
+ this.loadingValue = 100
+ this.loadingTimeout = setTimeout(() => { this.loadingBar = false }, 500)
+ }
}
}
},