diff --git a/src/store/modules/users.js b/src/store/modules/users.js index f35ad9aad264075ffccf03201bc9a41e2d954c0e..b26024dc070b73342bc75ad863c8483fe4f0e654 100644 --- a/src/store/modules/users.js +++ b/src/store/modules/users.js @@ -77,8 +77,9 @@ const users = { } }, actions: { - async ActivateUsers({ commit, getters }, nicknames) { - const { data } = await activateUsers(nicknames, getters.authHost, getters.token) + async ActivateUsers({ commit, getters }, users) { + const usersNicknames = users.map(user => user.nickname) + const { data } = await activateUsers(usersNicknames, getters.authHost, getters.token) commit('SWAP_USERS', data) }, async AddRight({ dispatch, getters, state }, { users, right }) { @@ -103,8 +104,9 @@ const users = { await createNewAccount(nickname, email, password, getters.authHost, getters.token) dispatch('FetchUsers', { page: state.currentPage }) }, - async DeactivateUsers({ commit, getters }, nicknames) { - const { data } = await deactivateUsers(nicknames, getters.authHost, getters.token) + async DeactivateUsers({ commit, getters }, users) { + const usersNicknames = users.map(user => user.nickname) + const { data } = await deactivateUsers(usersNicknames, getters.authHost, getters.token) commit('SWAP_USERS', data) }, async DeleteRight({ dispatch, getters, state }, { users, right }) { diff --git a/src/views/reports/components/TimelineItem.vue b/src/views/reports/components/TimelineItem.vue index 96433a2293d31a400e44a8771c19de611a697d9e..34336f792ce64fdd6dfe133b21aa87efd8c9fabb 100644 --- a/src/views/reports/components/TimelineItem.vue +++ b/src/views/reports/components/TimelineItem.vue @@ -148,10 +148,10 @@ export default { showDeactivatedButton(id) { return this.$store.state.user.id !== id }, - toggleActivation({ deactivated, nickname }) { - deactivated - ? this.$store.dispatch('ActivateUsers', [nickname]) - : this.$store.dispatch('DeactivateUsers', [nickname]) + toggleActivation(user) { + user.deactivated + ? this.$store.dispatch('ActivateUsers', [user]) + : this.$store.dispatch('DeactivateUsers', [user]) }, toggleTag(user, tag) { user.tags.includes(tag) diff --git a/src/views/users/index.vue b/src/views/users/index.vue index bd2cd7c42932f38665431358b9f03369645af350..b5cf1251f437771457e9e402e89bfb285d0ead33 100644 --- a/src/views/users/index.vue +++ b/src/views/users/index.vue @@ -275,10 +275,10 @@ export default { this.$store.dispatch('RequirePasswordReset', { nickname }) }, - toggleActivation({ deactivated, nickname }) { - deactivated - ? this.$store.dispatch('ActivateUsers', [nickname]) - : this.$store.dispatch('DeactivateUsers', [nickname]) + toggleActivation(user) { + user.deactivated + ? this.$store.dispatch('ActivateUsers', [user]) + : this.$store.dispatch('DeactivateUsers', [user]) }, handleDeletion(user) { this.$store.dispatch('DeleteUser', user)