mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20381 from nextcloud/fix/allow_edit_admin_user 

Allow to edit admin user
This commit is contained in:
Morris Jobke 2020-04-17 09:06:58 +02:00 committed by GitHub
parent a8809f079b d17c58eeec
commit 9bd9c2bf32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
apps/settings/js/vue-4.js
View File

File diff suppressed because one or more lines are too long

1
apps/settings/js/vue-4.js.map
View File

File diff suppressed because one or more lines are too long

6
apps/settings/js/vue-6.js
View File

File diff suppressed because one or more lines are too long

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