3686 reroute user to error page fix #3974
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
…s a partner they will be redirected to the partner users dashboard with an error message telling them they must be logged in as an org user to approve a new partner.
…d fixed tests accordingly. Added tests for redirect and warning if a partner clicks the review partner link from email
2 tasks
dorner
requested changes
Dec 15, 2023
| @@ -164,6 +165,13 @@ def reactivate | |||
|
|
|||
| private | |||
|
|
|||
| def validate_user_role | |||
| if current_user.kind == 'partner' | |||
There was a problem hiding this comment.
This won't work, because a user can have roles both as a partner and an org admin. You need to check current_role to determine what the user is currently logged in as, and base it off of that.
There was a problem hiding this comment.
Ahhh got ya. Change has been made along with 2 changes from the ruby linter. Should be good to go now.
…ole and 2 small changes based on ruby linter
dorner
approved these changes
Dec 20, 2023
|
Looks good - thanks! |
|
@thebkbuffalo: Your PR |
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.
Resolves #3686
Description
Gracefully handles error when a partner clicks the Review This Partner link from email. User is taken to partners root path (dashboard) with an error message stating they must be logged in as an org admin to approve a partner application.
Please also include relevant motivation and context.
Guide questions:
List any dependencies that are required for this change. (gems, js libraries, etc.)
Include anything else we should know about. -->
Type of change
How Has This Been Tested?
Yes.
Screenshots