diff options
| author | Christopher Ng <chrng8@gmail.com> | 2024-03-06 09:29:18 -0800 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-03-06 19:52:31 +0000 |
| commit | 110e727f086f453ffb08162b8c176e6a56c6e3e4 (patch) | |
| tree | ef5508db917dac391be16425df8485dd0c0c79c4 /apps/settings/src | |
| parent | 67c9ab49eaa452a20c4d01f8deb508c3561a7deb (diff) | |
| download | nextcloud-server-110e727f086f453ffb08162b8c176e6a56c6e3e4.tar.gz nextcloud-server-110e727f086f453ffb08162b8c176e6a56c6e3e4.zip | |
fix(settings): Split group lists
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Diffstat (limited to 'apps/settings/src')
| -rw-r--r-- | apps/settings/src/views/Users.vue | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue index dc17b9f9362..43e3e58909a 100644 --- a/apps/settings/src/views/Users.vue +++ b/apps/settings/src/views/Users.vue @@ -34,7 +34,7 @@ </template> </NcAppNavigationNew> - <template #list> + <NcAppNavigationList> <NcAppNavigationItem id="everyone" :exact="true" :name="t('settings', 'Active users')" @@ -79,41 +79,44 @@ </NcCounterBubble> </template> </NcAppNavigationItem> + </NcAppNavigationList> + + <NcAppNavigationCaption :name="t('settings', 'Groups')" + :disabled="loadingAddGroup" + :aria-label="loadingAddGroup ? t('settings', 'Creating group …') : t('settings', 'Create group')" + force-menu + is-heading + :open.sync="isAddGroupOpen"> + <template #actionsTriggerIcon> + <NcLoadingIcon v-if="loadingAddGroup" /> + <Plus v-else :size="20" /> + </template> + <template #actions> + <NcActionText> + <template #icon> + <AccountGroup :size="20" /> + </template> + {{ t('settings', 'Create group') }} + </NcActionText> + <NcActionInput :label="t('settings', 'Group name')" + data-cy-settings-new-group-name + :label-outside="false" + :disabled="loadingAddGroup" + :value.sync="newGroupName" + :error="hasAddGroupError" + :helper-text="hasAddGroupError ? t('settings', 'Please enter a valid group name') : ''" + @submit="createGroup" /> + </template> + </NcAppNavigationCaption> - <NcAppNavigationCaption :name="t('settings', 'Groups')" - :disabled="loadingAddGroup" - :aria-label="loadingAddGroup ? t('settings', 'Creating group …') : t('settings', 'Create group')" - force-menu - :open.sync="isAddGroupOpen"> - <template #actionsTriggerIcon> - <NcLoadingIcon v-if="loadingAddGroup" /> - <Plus v-else :size="20" /> - </template> - <template #actions> - <NcActionText> - <template #icon> - <AccountGroup :size="20" /> - </template> - {{ t('settings', 'Create group') }} - </NcActionText> - <NcActionInput :label="t('settings', 'Group name')" - data-cy-settings-new-group-name - :label-outside="false" - :disabled="loadingAddGroup" - :value.sync="newGroupName" - :error="hasAddGroupError" - :helper-text="hasAddGroupError ? t('settings', 'Please enter a valid group name') : ''" - @submit="createGroup" /> - </template> - </NcAppNavigationCaption> - + <NcAppNavigationList> <GroupListItem v-for="group in groupList" :id="group.id" :key="group.id" :active="selectedGroupDecoded === group.id" :name="group.title" :count="group.count" /> - </template> + </NcAppNavigationList> <template #footer> <ul class="app-navigation-entry__settings"> @@ -150,6 +153,7 @@ import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js' import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js' import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigationCaption.js' import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js' +import NcAppNavigationList from '@nextcloud/vue/dist/Components/NcAppNavigationList.js' import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js' import NcContent from '@nextcloud/vue/dist/Components/NcContent.js' import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js' @@ -182,6 +186,7 @@ export default { NcAppNavigation, NcAppNavigationCaption, NcAppNavigationItem, + NcAppNavigationList, NcAppNavigationNew, NcContent, NcCounterBubble, |