upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Allow to edit admin user

Browse source 
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

(cherry picked from commit d17c58eeec)
This commit is contained in:
Daniel Kesselberg 2020-04-17 10:30:09 +02:00
parent b5a1621eba
commit 792a642ca5
No known key found for this signature in database
GPG key ID: 36E3664E099D0614
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/settings/js/vue-5.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-5.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/settings/js/vue-settings-apps-users-management.js
View file

File diff suppressed because one or more lines are too long

2
apps/settings/js/vue-settings-apps-users-management.js.map
View file

File diff suppressed because one or more lines are too long

4
apps/settings/src/components/UserList/UserRowSimple.vue
View file

@ -83,7 +83,6 @@
import { PopoverMenu, Actions, ActionButton } from 'nextcloud-vue'
import ClickOutside from 'vue-click-outside'
import { getCurrentUser } from '@nextcloud/auth'
import UserRowMixin from '../../mixins/UserRowMixin'
export default {
name: 'UserRowSimple',
@ -148,7 +147,7 @@ export default {
return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
},
canEdit() {
return getCurrentUser().uid !== this.user.id && this.user.id !== 'admin'
return getCurrentUser().uid !== this.user.id || this.settings.isAdmin
},
userQuota() {
if (this.user.quota.quota === 'none') {
@ -159,7 +158,6 @@ export default {
}
return OC.Util.humanFileSize(0)
},
},
methods: {
hideMenu() {