Skip to content

Commit

Permalink
Merge pull request #39909 from nextcloud/fix/a11y-users-list-select-f…
Browse files Browse the repository at this point in the history
…ocus-on-tag-delete
  • Loading branch information
Pytal committed Aug 16, 2023
2 parents 3ff9e72 + d8d9567 commit db3e60c
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
21 changes: 12 additions & 9 deletions apps/settings/src/components/Users/UserRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
</label>
<NcSelect :input-id="'groups' + uniqueId"
:close-on-select="false"
:disabled="idState.loading.groups || isLoadingField"
:disabled="isLoadingField"
:loading="idState.loading.groups"
:multiple="true"
:options="availableGroups"
Expand Down Expand Up @@ -163,7 +163,7 @@
</label>
<NcSelect :id="'subadmins' + uniqueId"
:close-on-select="false"
:disabled="idState.loading.subadmins || isLoadingField"
:disabled="isLoadingField"
:loading="idState.loading.subadmins"
label="name"
:multiple="true"
Expand All @@ -190,7 +190,7 @@
<NcSelect v-model="editedUserQuota"
:close-on-select="true"
:create-option="validateQuota"
:disabled="idState.loading.quota || isLoadingField"
:disabled="isLoadingField"
:loading="idState.loading.quota"
:clearable="false"
:input-id="'quota' + uniqueId"
Expand Down Expand Up @@ -221,7 +221,7 @@
</label>
<NcSelect :id="'language' + uniqueId"
:allow-empty="false"
:disabled="idState.loading.languages || isLoadingField"
:disabled="isLoadingField"
:loading="idState.loading.languages"
:clearable="false"
:options="availableLanguages"
Expand Down Expand Up @@ -264,7 +264,7 @@
<NcSelect v-model="idState.currentManager"
:input-id="'manager' + uniqueId"
:close-on-select="true"
:disabled="idState.loading.manager || isLoadingField"
:disabled="isLoadingField"
:loading="idState.loading.manager"
label="displayname"
:options="idState.possibleManagers"
Expand Down Expand Up @@ -394,12 +394,15 @@ export default {
editedDisplayName: this.user.displayname,
editedPassword: '',
editedMail: this.user.email ?? '',
// TRANSLATORS This string describes a manager in the context of an organization
managerLabel: t('settings', 'Set user manager'),
}
},
computed: {
managerLabel() {
// TRANSLATORS This string describes a manager in the context of an organization
return t('settings', 'Set user manager')
},
isObfuscated() {
return isObfuscated(this.user)
},
Expand Down Expand Up @@ -568,13 +571,13 @@ export default {
})
},
updateUserManager(manager) {
async updateUserManager(manager) {
if (manager === null) {
this.idState.currentManager = ''
}
this.idState.loading.manager = true
try {
this.$store.dispatch('setUserData', {
await this.$store.dispatch('setUserData', {
userid: this.user.id,
key: 'manager',
value: this.idState.currentManager ? this.idState.currentManager.id : '',
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-users-8351.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-8351.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

0 comments on commit db3e60c

Please sign in to comment.