alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feat/deep-link-account-approval' into 'develop' 

Deep link to the user account in AdminFE in account confirmation emails

See merge request pleroma/pleroma!3065
This commit is contained in:
feld 2020-10-09 22:35:09 +00:00
parent 1aabc0672e 3ca98878d2
commit bc3cf0fee0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/emails/admin_email.ex
View File

@ -88,7 +88,7 @@ def new_unapproved_registration(to, account) do
html_body = """ html_body = """
<p>New account for review: <a href="#{user_url(account)}">@#{account.nickname}</a></p> <p>New account for review: <a href="#{user_url(account)}">@#{account.nickname}</a></p>
<blockquote>#{HTML.strip_tags(account.registration_reason)}</blockquote> <blockquote>#{HTML.strip_tags(account.registration_reason)}</blockquote>
<a href="#{Pleroma.Web.base_url()}/pleroma/admin">Visit AdminFE</a> <a href="#{Pleroma.Web.base_url()}/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a>
""" """
new() new()

2
test/emails/admin_email_test.exs
View File

@ -63,7 +63,7 @@ test "new unapproved registration email" do
assert res.html_body == """ assert res.html_body == """
<p>New account for review: <a href="#{account_url}">@#{account.nickname}</a></p> <p>New account for review: <a href="#{account_url}">@#{account.nickname}</a></p>
<blockquote>Plz let me in</blockquote> <blockquote>Plz let me in</blockquote>
<a href="http://localhost:4001/pleroma/admin">Visit AdminFE</a> <a href="http://localhost:4001/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a>
""" """
end end
end end