Skip to content

Commit 16aa0e8

Browse files
committed
Allow to edit admin user
Signed-off-by: GretaD <gretadoci@gmail.com>
1 parent 21b7e51 commit 16aa0e8

File tree

7 files changed

+11677
-4
lines changed

7 files changed

+11677
-4
lines changed

apps/settings/js/vue-1.js

Lines changed: 3296 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-1.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-2.js

Lines changed: 4955 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-2.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-3.js

Lines changed: 3420 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-3.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/src/components/UserList/UserRowSimple.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</div>
5959

6060
<div class="userActions">
61-
<div v-if="canEdit && !loading.all" class="toggleUserActions">
61+
<div v-if="canEditUser(user) && !loading.all" class="toggleUserActions">
6262
<Actions>
6363
<ActionButton icon="icon-rename" @click="toggleEdit">
6464
{{ t('settings', 'Edit User') }}
@@ -82,7 +82,6 @@
8282
<script>
8383
import { PopoverMenu, Actions, ActionButton } from '@nextcloud/vue'
8484
import ClickOutside from 'vue-click-outside'
85-
import { getCurrentUser } from '@nextcloud/auth'
8685
8786
import UserRowMixin from '../../mixins/UserRowMixin'
8887
export default {
@@ -147,8 +146,8 @@ export default {
147146
}
148147
return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
149148
},
150-
canEdit() {
151-
return getCurrentUser().uid !== this.user.id && this.user.id !== 'admin'
149+
canEditUser() {
150+
return (user) => this.settings.isAdmin || user.id !== OC.getCurrentUser().uid
152151
},
153152
userQuota() {
154153
if (this.user.quota.quota === 'none') {

0 commit comments

Comments
 (0)