Merge branch 'develop' into 'iss-149/profile-fields-setting'

# Conflicts: # src/components/settings_modal/tabs/profile_tab.vue
2020-06-27 07:19:49 +00:00 · 2020-06-27 07:19:49 +00:00 · ea0a12f604
commit ea0a12f604
parent bad3dacfac bbb91d8ae3
50 changed files with 570 additions and 286 deletions
--- a/src/modules/users.js
+++ b/src/modules/users.js
@ -435,10 +435,10 @@ const users = {
        store.commit('setUserForNotification', notification)
      })
    },
-    searchUsers (store, { query }) {
-      return store.rootState.api.backendInteractor.searchUsers({ query })
+    searchUsers ({ rootState, commit }, { query }) {
+      return rootState.api.backendInteractor.searchUsers({ query })
        .then((users) => {
-          store.commit('addNewUsers', users)
+          commit('addNewUsers', users)
          return users
        })
    },