fix(settings): Fix erroneous hiding of group admin column with paginated groups

Signed-off-by: Christopher Ng <chrng8@gmail.com>
pull/51782/head
Christopher Ng 2025-03-25 14:31:44 +07:00 committed by backportbot[bot]
parent 74b26f7484
commit ae390d2983
4 changed files with 4 additions and 14 deletions

@ -78,8 +78,7 @@
Subadmins can't create users outside their groups
Therefore, empty select is forbidden -->
</div>
<div v-if="subAdminsGroups.length > 0"
class="dialog__item">
<div class="dialog__item">
<NcSelect v-model="newUser.subAdminsGroups"
class="dialog__select"
:input-label="t('settings', 'Admin of the following groups')"

@ -42,7 +42,7 @@
scope="col">
<span>{{ t('settings', 'Groups') }}</span>
</th>
<th v-if="subAdminsGroups.length > 0 && (settings.isAdmin || settings.isDelegatedAdmin)"
<th v-if="settings.isAdmin || settings.isDelegatedAdmin"
class="header__cell header__cell--large"
data-cy-user-list-header-subadmins
scope="col">
@ -119,11 +119,6 @@ export default Vue.extend({
return this.$store.getters.getServerData
},
subAdminsGroups() {
// @ts-expect-error: allow untyped $store
return this.$store.getters.getSubadminGroups
},
passwordLabel(): string {
if (this.hasObfuscated) {
// TRANSLATORS This string is for a column header labelling either a password or a message that the current user has insufficient permissions

@ -129,10 +129,10 @@
</span>
</td>
<td v-if="userSubAdminGroups.length > 0 && (settings.isAdmin || settings.isDelegatedAdmin)"
<td v-if="settings.isAdmin || settings.isDelegatedAdmin"
data-cy-user-list-cell-subadmins
class="row__cell row__cell--large row__cell--multiline">
<template v-if="editing && (settings.isAdmin || settings.isDelegatedAdmin) && userSubAdminGroups.length > 0">
<template v-if="editing && (settings.isAdmin || settings.isDelegatedAdmin)">
<label class="hidden-visually"
:for="'subadmins' + uniqueId">
{{ t('settings', 'Set account as admin for') }}

@ -255,10 +255,6 @@ const getters = {
getGroups(state) {
return state.groups
},
getSubadminGroups(state) {
// Can't be subadmin of admin, recent, or disabled
return state.groups.filter(group => group.id !== 'admin' && group.id !== '__nc_internal_recent' && group.id !== 'disabled')
},
getSortedGroups(state) {
const groups = [...state.groups]
if (state.orderBy === GroupSorting.UserCount) {