Skip to content

feat: Add back searching in disabled user list #45370

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
come-nc merged 4 commits into from
May 23, 2024
Merged

feat: Add back searching in disabled user list #45370

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
6d56f35
feat: Add back searching in disabled user list
come-nc May 16, 2024
8044edf
fix: Also search in email field for disabled users
come-nc May 16, 2024
96b6662
fix: Update openapi spec for provisioning_api app
come-nc May 16, 2024
9a523e9
chore(assets): Recompile assets
nextcloud-command May 23, 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: Also search in email field for disabled users 
To match what is done for Database backend for enabled users

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed May 23, 2024
commit 8044edf30977149a1ad1ae3cdd4d3e1485fb4060
3 changes: 2 additions & 1 deletion apps/user_ldap/lib/User_Proxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,8 @@ public function getDisabledUserList(?int $limit = null, int $offset = 0, string
fn (OfflineUser $user): bool =>
mb_stripos($user->getOCName(), $search) !== false ||
mb_stripos($user->getUID(), $search) !== false ||
mb_stripos($user->getDisplayName(), $search) !== false,
mb_stripos($user->getDisplayName(), $search) !== false ||
mb_stripos($user->getEmail(), $search) !== false,
);
}
return array_map(
Expand Down
3 changes: 2 additions & 1 deletion lib/private/User/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,8 @@ public function getDisabledUsers(?int $limit = null, int $offset = 0, string $se
$users,
fn (IUser $user): bool =>
mb_stripos($user->getUID(), $search) !== false ||
mb_stripos($user->getDisplayName(), $search) !== false,
mb_stripos($user->getDisplayName(), $search) !== false ||
mb_stripos($user->getEMailAddress() ?? '', $search) !== false,
);
}

Expand Down