Fix bug where org_admins couldn't promote users #4729
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.
Resolves #4724
Description
#4701 fixed an issue where super admins couldn't promote a user (#4664), but in the process broke user promotion for organization admins.
This is because the fix in #4701 directed super admins to the admin edit user path, which organizational admins don't have access to (and shouldn't I think?).
The reason super admins couldn't originally promote users was because
current_organization
was being called here, which for super admins was evaluating tonil
. The fix here adds theorganization_name
as a parameter to those promotion/demotion requests so thatcurrent_organization
will evaluate correctly.Type of change
Changes:
- Organization admins can now promote users
- Super admins can now demote users
- There is now a notice "User has been demoted!" when users are demoted.
How Has This Been Tested?
Added request and system specs.