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

# Conflicts:
#   src/lang/en.js
#   src/store/modules/users.js
#   src/views/users/index.vue
This commit is contained in:
Angelina Filippova 2019-04-04 21:20:33 +00:00
commit 741ed11bb1

View file

@ -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()