Skip to content

feat(users): Add users and group management to admin delegation #46418

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
artonge merged 6 commits into from
Jul 24, 2024
+297 −135
Merged

feat(users): Add users and group management to admin delegation #46418

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1af827f
fix(users): Improve error handling of some fields update
artonge Jul 11, 2024
dff8815
feat(users): Add support for admin delegation for users and groups ma…
artonge Jul 11, 2024
26beede
test(users): Adapt tests to new admin delegation checks
artonge Jul 16, 2024
3574d7e
feat(users): Enable features for delegated user admins
artonge Jul 22, 2024
5f8c466
fix(users): Remove useless filtering condition
artonge Jul 22, 2024
7f0f671
chore: Compile assets
artonge Jul 22, 2024
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
Prev Previous commit
Next Next commit
fix(users): Remove useless filtering condition 
Signed-off-by: Louis Chemineau <[email protected]>
  • Loading branch information
@artonge
artonge committed Jul 22, 2024
commit 5f8c466f78c5fa95d18da5be5d73f12950c144a5
4 changes: 0 additions & 4 deletions apps/settings/src/components/UserList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ export default {
if (this.selectedGroup === 'disabled') {
return this.users.filter(user => user.enabled === false)
}
if (!this.settings.isAdmin) {
// we don't want subadmins to edit themselves
return this.users.filter(user => user.enabled !== false)
}
return this.users.filter(user => user.enabled !== false)
},

Expand Down