diff options
| author | feld <feld@feld.me> | 2020-10-09 22:35:09 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-09 22:35:09 +0000 |
| commit | bc3cf0fee0b93eb3cf8d2ba0f9a0dcc09b01331d (patch) | |
| tree | 5ad6ba418dcbb65c1bab4424c0d653cb8f7e25d5 | |
| parent | 1aabc0672e17c2b931eae19d39da8713f9ff40a0 (diff) | |
| parent | 3ca98878d27478037233a92f72adb3fbade62035 (diff) | |
| download | pleroma-bc3cf0fee0b93eb3cf8d2ba0f9a0dcc09b01331d.tar.gz | |
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
| -rw-r--r-- | lib/pleroma/emails/admin_email.ex | 2 | ||||
| -rw-r--r-- | test/emails/admin_email_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/emails/admin_email.ex b/lib/pleroma/emails/admin_email.ex index c27ad1065..8979db2f8 100644 --- a/lib/pleroma/emails/admin_email.ex +++ b/lib/pleroma/emails/admin_email.ex @@ -88,7 +88,7 @@ defmodule Pleroma.Emails.AdminEmail do html_body = """ <p>New account for review: <a href="#{user_url(account)}">@#{account.nickname}</a></p> <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() diff --git a/test/emails/admin_email_test.exs b/test/emails/admin_email_test.exs index e24231e27..155057f3e 100644 --- a/test/emails/admin_email_test.exs +++ b/test/emails/admin_email_test.exs @@ -63,7 +63,7 @@ defmodule Pleroma.Emails.AdminEmailTest do assert res.html_body == """ <p>New account for review: <a href="#{account_url}">@#{account.nickname}</a></p> <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 |