Skip to content

Commit 9bd9c2b

Browse files
authored
Merge pull request #20381 from nextcloud/fix/allow_edit_admin_user
Allow to edit admin user
2 parents a8809f0 + d17c58e commit 9bd9c2b

File tree

7 files changed

+8
-100
lines changed

7 files changed

+8
-100
lines changed

apps/settings/js/vue-4.js

Lines changed: 0 additions & 89 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/settings/js/vue-6.js

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

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

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

apps/settings/js/vue-settings-apps-users-management.js

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

apps/settings/js/vue-settings-apps-users-management.js.map

Lines changed: 1 addition & 1 deletion
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: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
import { PopoverMenu, Actions, ActionButton } from '@nextcloud/vue'
8484
import ClickOutside from 'vue-click-outside'
8585
import { getCurrentUser } from '@nextcloud/auth'
86-
8786
import UserRowMixin from '../../mixins/UserRowMixin'
8887
export default {
8988
name: 'UserRowSimple',
@@ -148,7 +147,7 @@ export default {
148147
return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
149148
},
150149
canEdit() {
151-
return getCurrentUser().uid !== this.user.id && this.user.id !== 'admin'
150+
return getCurrentUser().uid !== this.user.id || this.settings.isAdmin
152151
},
153152
userQuota() {
154153
if (this.user.quota.quota === 'none') {
@@ -159,7 +158,6 @@ export default {
159158
}
160159
return OC.Util.humanFileSize(0)
161160
},
162-
163161
},
164162
methods: {
165163
hideMenu() {

0 commit comments

Comments
 (0)