Make distinction between DisplayName and Username in email templates #6495
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
Store the actual username in the variable named Username and store the separate DisplayName in another variable. This allows us to access the actual username when we need, which currently fails if a user has set a full name. Fixes go-gitea#6161
Codecov Report
@@ Coverage Diff @@
## master #6495 +/- ##
==========================================
+ Coverage 40.27% 40.28% +0.01%
==========================================
Files 403 403
Lines 54068 54069 +1
==========================================
+ Hits 21775 21781 +6
+ Misses 29276 29270 -6
- Partials 3017 3018 +1
Continue to review full report at Codecov.
|
GiteaBot
added
the
lgtm/need 2
jolheiser
requested changes
Apr 2, 2019
models/mail.go
Outdated
| @@ -47,7 +47,8 @@ func SendTestMail(email string) error { | |||
| // SendUserMail sends a mail to the user | |||
| func SendUserMail(c *macaron.Context, u *User, tpl base.TplName, code, subject, info string) { | |||
| data := map[string]interface{}{ | |||
| "Username": u.DisplayName(), | |||
| "DisplayName": u.DisplayName(), | |||
| "Username": u.DisplayUsername(), | |||
There was a problem hiding this comment.
This can just be u.Name, no need for a func.
models/user.go
Outdated
| @@ -650,6 +650,11 @@ func (u *User) DisplayName() string { | |||
| return u.Name | |||
| } | |||
|
|
|||
| // DisplayUsername returns username | |||
| func (u *User) DisplayUsername() string { | |||
No need for extra function, also change use in all mail sending functions here
|
Do all the maps actually need both |
|
True, I guess that is preemptive and if people do want to include the username in the future they can also add it to the map at that time. Appreciate the feedback! |
jolheiser
approved these changes
Apr 3, 2019
GiteaBot
added
lgtm/need 1
lafriks
approved these changes
Apr 4, 2019
GiteaBot
added
lgtm/done
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Store the actual username in the variable named Username and store the separate DisplayName in another variable. This allows us to access the actual username when we need, which currently fails if a user has set a full name.
Fixes #6161