feat(user): add user name #39
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
and update the app in necessary places
ka8725
reviewed
Aug 30, 2023
app/mailers/invitation_mailer.rb
Outdated
| @@ -1,9 +1,9 @@ | |||
| # frozen_string_literal: true | |||
|
|
|||
| class InvitationMailer < ApplicationMailer | |||
| def account_invitation(account_invitation) | |||
| def account_invitation(account_invitation, current_user) | |||
There was a problem hiding this comment.
Suggested change
| def account_invitation(account_invitation, current_user) | |
| def account_invitation(account_invitation) |
the user can be taken from account_invitation
There was a problem hiding this comment.
account_invitation contains only invitee data.
current_user is an inviter whose was pass to the mailer due to the name. The inviter name helps invitee recognize the person in an email invitation
There was a problem hiding this comment.
@andreybakanovsky what about the user_id column inside account_invitation model? Isn't it the user who sent the invite?
| @@ -10,7 +10,12 @@ | |||
| <%= render "devise/shared/error_messages", resource: resource %> | |||
|
|
|||
| <div class="field"> | |||
| <%= f.email_field_with_label :email, autofocus: true, autocomplete: "email" %> | |||
| <%= f.label :name %> | |||
There was a problem hiding this comment.
remove it from the registration page. it's ok to add in on edit profile page though.
VladislavSokov
approved these changes
Aug 30, 2023
ka8725
approved these changes
Aug 30, 2023
app/views/my_accounts/show.html.erb
Outdated
| @@ -1,4 +1,4 @@ | |||
| <%= account.name %> | |||
| <%= "#{current_user.name} #{account.email}"%> | |||
There was a problem hiding this comment.
Suggested change
| <%= "#{current_user.name} #{account.email}"%> | |
| <%= [current_user.name, account.email].select(&:present?).join(" ") %> |
|
@andreybakanovsky please fix the failed test |
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.
and update the app in necessary places