-
Notifications
You must be signed in to change notification settings - Fork 529
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
AO3-5610 notify users when a bookmark or series they have created is hidden #4760
Open
walshyb
wants to merge
24
commits into
otwcode:master
Choose a base branch
from
walshyb:AO3-5610-Notify-users-when-a-bookmark-or-series-they-have-created-is-hidden
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
29bf722
Create series notification mailer action
walshyb a7130a0
Create series model admin_hidden update handler
walshyb ecd02f8
Add series mailer content and en translation
walshyb c64d3b8
remove unnecessary end
walshyb 611b27d
Add hidden bookmark notification email
walshyb 8d7fe01
Remove explicit html_safe call
walshyb bc5800f
Merge master
walshyb 9974615
Add hidden bookmark mailer and preview
walshyb 1fbd9eb
Update hidden bookmark mailer locale
walshyb 787407d
Update hidden series mailer locale and add preview
walshyb 87af757
Remove explicit html_safe
walshyb a67f8c5
Fix incorrect filename
walshyb 0518c97
Remove unnecessary parentheses
walshyb 34558af
Linting fixes
walshyb 65899ff
Merge branch 'master' into AO3-5610-Notify-users-when-a-bookmark-or-s…
walshyb 305d684
Move placement of after_update callback
walshyb 5c300ea
Move after_update callback
walshyb 1224b15
Remove unnecessary single quote
walshyb 208da7d
Create user for hidden bookmark mailer test
walshyb a079f72
Create user for hidden series mailer test
walshyb 2de2360
Change var from bookmark_url to bookmark_link
walshyb 7251c16
Merge branch 'AO3-5610-Notify-users-when-a-bookmark-or-series-they-ha…
walshyb 695a6ca
Change var from bookmark_url to bookmark_link
walshyb 6b0784a
Update hidden bookmark mailer text to include bookmark title
walshyb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
13 changes: 13 additions & 0 deletions
13
app/views/user_mailer/admin_hidden_bookmark_notification.html.erb
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,13 @@ | ||||||
<% content_for :message do %> | ||||||
<p><%= t("mailer.general.greeting.formal_html", name: style_bold(@user.login)) %></p> | ||||||
|
||||||
<p><%= t(".hidden.html", title: style_creation_link(@bookmark.bookmarkable.title, @bookmark)) %></p> | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And then to match the change in the yml file and also conform to this from Jira:
Suggested change
|
||||||
|
||||||
<p><%= t(".access") %></p> | ||||||
|
||||||
<p><%= t(".check_email") %></p> | ||||||
|
||||||
<p><%= t(".tos_violation.html", tos_link: tos_link(t(".tos"))) %></p> | ||||||
|
||||||
<p><%= t(".help.html", contact_abuse_link: abuse_link(t(".contact_abuse"))) %></p> | ||||||
<% end %> |
13 changes: 13 additions & 0 deletions
13
app/views/user_mailer/admin_hidden_bookmark_notification.text.erb
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<% content_for :message do %> | ||
<%= t("mailer.general.greeting.formal_html", name: @user.login) %> | ||
|
||
<%= t(".hidden.text", title: @bookmark.bookmarkable.title, bookmark_link: bookmark_url(@bookmark)) %> | ||
|
||
<%= t(".access") %> | ||
|
||
<%= t(".check_email") %> | ||
|
||
<%= t(".tos_violation.text", tos_url: tos_url) %> | ||
|
||
<%= t(".help.text", contact_abuse_url: new_abuse_report_url) %> | ||
<% end %> |
13 changes: 13 additions & 0 deletions
13
app/views/user_mailer/admin_hidden_series_notification.html.erb
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<% content_for :message do %> | ||
<p><%= t("mailer.general.greeting.formal_html", name: style_bold(@user.login)) %></p> | ||
|
||
<p><%= t(".hidden.html", title: style_creation_link(@series.title, @series)) %></p> | ||
|
||
<p><%= t(".access") %></p> | ||
|
||
<p><%= t(".check_email") %></p> | ||
|
||
<p><%= t(".tos_violation.html", tos_link: tos_link(t(".tos"))) %></p> | ||
|
||
<p><%= t(".help.html", contact_abuse_link: abuse_link(t(".contact_abuse"))) %></p> | ||
<% end %> |
13 changes: 13 additions & 0 deletions
13
app/views/user_mailer/admin_hidden_series_notification.text.erb
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<% content_for :message do %> | ||
<%= t("mailer.general.greeting.formal_html", name: @user.login) %> | ||
|
||
<%= t(".hidden.text", title: @series.title, series_url: series_url(@series)) %> | ||
|
||
<%= t(".access") %> | ||
|
||
<%= t(".check_email") %> | ||
|
||
<%= t(".tos_violation.text", tos_url: tos_url) %> | ||
|
||
<%= t(".help.text", contact_abuse_url: new_abuse_report_url) %> | ||
<% end %> |
Large diffs are not rendered by default.
Oops, something went wrong.
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be in the model where
admin_hidden_bookmark_notification
is called and surround that call there, to make the locale selector in the preview work.Same for the other mail.