Skip to content

[stable28] feat: Add back searching in disabled user list #45478

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 5 commits into from
May 27, 2024
Merged

[stable28] feat: Add back searching in disabled user list #45478

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
896c539
feat: Add back searching in disabled user list
come-nc May 16, 2024
5fc46cd
fix: Also search in email field for disabled users
come-nc May 16, 2024
16c5b28
fix: Update openapi spec for provisioning_api app
come-nc May 16, 2024
f15f51c
chore: Adapt `@since` version number in OCP for backport to 28
come-nc May 27, 2024
303ffbf
chore(assets): Recompile assets
nextcloud-command May 27, 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
chore: Adapt @since version number in OCP for backport to 28 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
  • Loading branch information
@come-nc
come-nc committed May 27, 2024
commit f15f51c2cee9b37567cbe96550b27e343ff64141
2 changes: 1 addition & 1 deletion lib/public/IUserManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public function searchDisplayName($pattern, $limit = null, $offset = null);
/**
* @return IUser[]
* @since 28.0.0
* @since 30.0.0 $search parameter added
* @since 28.0.7 $search parameter added
*/
public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array;

Expand Down
2 changes: 1 addition & 1 deletion lib/public/User/Backend/IProvideEnabledStateBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function setUserEnabled(string $uid, bool $enabled, callable $queryDataba
* Get the list of disabled users, to merge with the ones disabled in database
*
* @since 28.0.0
* @since 30.0.0 $search parameter added
* @since 28.0.7 $search parameter added
*
* @return string[]
*/
Expand Down