diff --git a/src/store/modules/ADempiere/WorkflowActivity.js b/src/store/modules/ADempiere/WorkflowActivity.js index afdd4c90..49bf0b92 100644 --- a/src/store/modules/ADempiere/WorkflowActivity.js +++ b/src/store/modules/ADempiere/WorkflowActivity.js @@ -24,6 +24,9 @@ export default { serverListActivity({ commit, state, dispatch, rootGetters }, params) { const userUuid = isEmptyValue(params) ? rootGetters['user/getUserUuid'] : params const name = language.t('navbar.badge.activity') + if (isEmptyValue(userUuid)) { + return + } workflowActivities({ userUuid }) diff --git a/src/store/modules/ADempiere/system.js b/src/store/modules/ADempiere/system.js index af8776a3..f2fb0794 100644 --- a/src/store/modules/ADempiere/system.js +++ b/src/store/modules/ADempiere/system.js @@ -50,13 +50,14 @@ const system = { }) }) }, - getLanguagesFromServer({ commit }) { + getLanguagesFromServer({ commit, dispatch, rootGetters }) { return new Promise(resolve => { requestLanguagesList({ pageToke: undefined, pageSize: undefined }) .then(languageResponse => { + dispatch('serverListActivity', rootGetters['user/getUserUuid']) const languagesList = languageResponse.languagesList.map(language => { return { ...language, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 47a6994f..68be1972 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -196,7 +196,6 @@ export default { }) .finally(() => { this.loading = false - this.$store.dispatch('serverListActivity') }) } else { console.log('error submit!!')