Include and exclude multiple user groups in USC #3168
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This modifies the user group filter in the user search controller to allow for admins to include or exclude users from multiple user groups. Additionally, I pulled out the filter accordion into it's own template so we never need to write the code twice ever again. I also fixed the logic of how exclusion queries were combined in the user search controller (before we were using
AND
s and now we useOR
s). I guess this bug was never reported because no one ever used multiple exclusion queries before (e.g. exclude user groups and exclude students with fewer than 2 class blocks).Fixes #3142.