Fix validation failures and error page display #16399
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
aoby
reviewed
Jul 13, 2017
| @@ -59,6 +59,7 @@ def upgrade | |||
| successfully_updated = can_update && current_user.update(update_params(params_to_pass)) | |||
| has_email = current_user.parent_email.blank? && current_user.hashed_email.present? | |||
| success_message_kind = has_email ? :personal_login_created_email : :personal_login_created_username | |||
| user.reload unless successfully_updated # if update fails, roll back user model so error page renders correctly | |||
There was a problem hiding this comment.
Does the error page not inspect user.errors? Reloading user will clear those.
There was a problem hiding this comment.
That doesn't appear to be the case, the errors show up correctly with this change:
What the user typed in gets cleared out, which is not ideal, but in this context (just the upgrade call) it's not terrible because most of that information is either secret confirmation or password-related, so doesn't auto-fill anyways.
aoby
approved these changes
Jul 13, 2017
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.
Enables validation of email/parent_email presence when upgrading an account, as well as turning on username uniqueness validation.
Also reloads the user model when the upgrade action fails, so that the error page displays based on the pre-upgrade values (otherwise it ends up displaying in an odd mixed state, depending on which fields have been entered).