Add custom subject for all kinds of mail templates #27861
+63
−11
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
GiteaBot
added
the
lgtm/need 2
pull-request-size
bot
added
the
size/M
lng2020
changed the title
delvh
reviewed
Nov 1, 2023
Comment on lines
+78
to
+82
| subjectFromTemplate := subjectFromTemplate(string(tpl), data) | ||
| if subjectFromTemplate != "" { | ||
| subject = subjectFromTemplate | ||
| } | ||
| data["Subject"] = subject |
There was a problem hiding this comment.
Can't we extract this into a new function setSubject that takes as parameters data, defaultSubject and always call that instead?
There was a problem hiding this comment.
Make sense. Will change it.
There was a problem hiding this comment.
Em...Now I think the current way is better.
subject var is also used in NewMessage(u.Email, subject, content.String()). If using setSubject and removing the subject var, then we should use NewMessage(u.Email, data["Subject"].(string), content.String()) instead. I don't know if it's a good idea to use type assertion in such simple code.
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.
Apply template subject to all mail types (activate account, reset password, etc.).
Follow #8329 (it's in the future enhancement list of that PR but it got forgotten for 4 years)
Fix #27793