Skip to content

Allow to edit admin/own user in the user management #18555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 4 commits into from
Mar 10, 2020
Merged

Allow to edit admin/own user in the user management #18555

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bde1644
Allow to edit admin/own user in the user management
juliusknorr Dec 23, 2019
1103e8a
Fix row height and display name input
juliusknorr Feb 25, 2020
93e6889
Fix group navigation
juliusknorr Feb 25, 2020
b9d5186
Bump bundles
juliusknorr Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Allow to edit admin/own user in the user management 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Mar 10, 2020
commit bde16441a9697fbb09bdb86f22d576c85cdfd735
2 changes: 1 addition & 1 deletion apps/settings/src/components/UserList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ export default {
}
if (!this.settings.isAdmin) {
// 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)
},
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/components/UserList/UserRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
<div v-if="showConfig.showLastLogin" />

<div class="userActions">
<div v-if="OC.currentUser !== user.id && user.id !== 'admin' && !loading.all"
<div v-if="!loading.all"
class="toggleUserActions">
<Actions>
<ActionButton icon="icon-checkmark"
Expand Down
8 changes: 3 additions & 5 deletions apps/settings/src/components/UserList/UserRowSimple.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</div>

<div class="userActions">
<div v-if="canEdit && !loading.all" class="toggleUserActions">
<div v-if="canEditUser(user) && !loading.all" class="toggleUserActions">
<Actions>
<ActionButton icon="icon-rename" @click="toggleEdit">
{{ t('settings', 'Edit User') }}
Expand All @@ -79,7 +79,6 @@
<script>
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 {
Expand Down Expand Up @@ -144,10 +143,9 @@ export default {
}
return t('settings', '{size} used', { size: OC.Util.humanFileSize(0) })
},
canEdit() {
return getCurrentUser().uid !== this.user.id && this.user.id !== 'admin'
canEditUser() {
return (user) => this.settings.isAdmin || user.id !== OC.getCurrentUser().uid
},

},
methods: {
hideMenu() {
Expand Down