diff options
Diffstat (limited to 'apps/settings/src/store')
| -rw-r--r-- | apps/settings/src/store/apps.js | 3 | ||||
| -rw-r--r-- | apps/settings/src/store/users.js | 19 |
2 files changed, 14 insertions, 8 deletions
diff --git a/apps/settings/src/store/apps.js b/apps/settings/src/store/apps.js index c58651a3cf5..e0068d3892e 100644 --- a/apps/settings/src/store/apps.js +++ b/apps/settings/src/store/apps.js @@ -5,6 +5,7 @@ import api from './api.js' import Vue from 'vue' +import axios from '@nextcloud/axios' import { generateUrl } from '@nextcloud/router' import { showError, showInfo } from '@nextcloud/dialogs' import { loadState } from '@nextcloud/initial-state' @@ -191,7 +192,7 @@ const actions = { }) // check for server health - return api.get(generateUrl('apps/files/')) + return axios.get(generateUrl('apps/files/')) .then(() => { if (response.data.update_required) { showInfo( diff --git a/apps/settings/src/store/users.js b/apps/settings/src/store/users.js index a6298a38e2d..3734b7008df 100644 --- a/apps/settings/src/store/users.js +++ b/apps/settings/src/store/users.js @@ -36,7 +36,10 @@ const defaults = { const state = { users: [], - groups: [...(usersSettings.systemGroups ?? [])], + groups: [ + ...(usersSettings.getSubAdminGroups ?? []), + ...(usersSettings.systemGroups ?? []), + ], orderBy: usersSettings.sortGroups ?? GroupSorting.UserCount, minPasswordLength: 0, usersOffset: 0, @@ -232,12 +235,10 @@ const mutations = { * @param {object} state the store state */ resetGroups(state) { - const systemGroups = state.groups.filter(group => [ - 'admin', - '__nc_internal_recent', - 'disabled', - ].includes(group.id)) - state.groups = [...systemGroups] + state.groups = [ + ...(usersSettings.getSubAdminGroups ?? []), + ...(usersSettings.systemGroups ?? []), + ] }, setShowConfig(state, { key, value }) { @@ -270,6 +271,10 @@ const getters = { getGroups(state) { return state.groups }, + getSubAdminGroups() { + return usersSettings.subAdminGroups ?? [] + }, + getSortedGroups(state) { const groups = [...state.groups] if (state.orderBy === GroupSorting.UserCount) { |