Skip to content
Snippets Groups Projects
Commit 741ed11b authored by Angelina Filippova's avatar Angelina Filippova
Browse files

Merge branch 'master' into 'feature/add-reports'

# Conflicts:
#   src/lang/en.js
#   src/store/modules/users.js
#   src/views/users/index.vue
parents 44a771f2 75182336
No related branches found
No related tags found
No related merge requests found
......@@ -48,6 +48,9 @@ const users = {
},
actions: {
async FetchUsers({ commit, state, getters }, { page }) {
const filters = Object.keys(state.filters).filter(filter => state.filters[filter]).join()
const response = await fetchUsers(filters, getters.authHost, getters.token, page)
commit('SET_LOADING', true)
const filters = Object.keys(state.filters).filter(filter => state.filters[filter]).join()
......
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