Fix deleting user references from the admin UI #5756
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes opencast#5753, where a `matterhoron-reference` user could not be deleted, presumably because it wasn't found. This was broken by opencast#5062, and looks like a classic merge conflict resolution mistake to me. The result is that we look up the user we want to delete in the user and roles provider twice, and ignore the user reference provider, which happens to be `null` anyway, since it is never bound in the first place.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #5753, where a
matterhoron-referenceuser could not be deleted, presumably because it wasn't found.This was broken by #5062, and looks like a classic merge conflict resolution mistake to me. The result is that we look up the user we want to delete in the user and roles provider twice, and ignore the user reference provider, which happens to be
nullanyway, since it is never bound in the first place.