Allow to edit admin/own user in the user management
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
parent
812f16880b
commit
bde16441a9
|
@ -318,7 +318,7 @@ export default {
|
||||||
}
|
}
|
||||||
if (!this.settings.isAdmin) {
|
if (!this.settings.isAdmin) {
|
||||||
// we don't want subadmins to edit themselves
|
// we don't want subadmins to edit themselves
|
||||||
return this.users.filter(user => user.enabled !== false && user.id !== OC.getCurrentUser().uid)
|
return this.users.filter(user => user.enabled !== false)
|
||||||
}
|
}
|
||||||
return this.users.filter(user => user.enabled !== false)
|
return this.users.filter(user => user.enabled !== false)
|
||||||
},
|
},
|
||||||
|
|
|
@ -216,7 +216,7 @@
|
||||||
<div v-if="showConfig.showLastLogin" />
|
<div v-if="showConfig.showLastLogin" />
|
||||||
|
|
||||||
<div class="userActions">
|
<div class="userActions">
|
||||||
<div v-if="OC.currentUser !== user.id && user.id !== 'admin' && !loading.all"
|
<div v-if="!loading.all"
|
||||||
class="toggleUserActions">
|
class="toggleUserActions">
|
||||||
<Actions>
|
<Actions>
|
||||||
<ActionButton icon="icon-checkmark"
|
<ActionButton icon="icon-checkmark"
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="userActions">
|
<div class="userActions">
|
||||||
<div v-if="canEdit && !loading.all" class="toggleUserActions">
|
<div v-if="canEditUser(user) && !loading.all" class="toggleUserActions">
|
||||||
<Actions>
|
<Actions>
|
||||||
<ActionButton icon="icon-rename" @click="toggleEdit">
|
<ActionButton icon="icon-rename" @click="toggleEdit">
|
||||||
{{ t('settings', 'Edit User') }}
|
{{ t('settings', 'Edit User') }}
|
||||||
|
@ -79,7 +79,6 @@
|
||||||
<script>
|
<script>
|
||||||
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 UserRowMixin from '../../mixins/UserRowMixin'
|
import UserRowMixin from '../../mixins/UserRowMixin'
|
||||||
export default {
|
export default {
|
||||||
|
@ -144,10 +143,9 @@ export default {
|
||||||
}
|
}
|
||||||
return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
|
return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
|
||||||
},
|
},
|
||||||
canEdit() {
|
canEditUser() {
|
||||||
return getCurrentUser().uid !== this.user.id && this.user.id !== 'admin'
|
return (user) => this.settings.isAdmin || user.id !== OC.getCurrentUser().uid
|
||||||
},
|
},
|
||||||
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
hideMenu() {
|
hideMenu() {
|
||||||
|
|
Loading…
Reference in New Issue