logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: bc3cf0fee0b93eb3cf8d2ba0f9a0dcc09b01331d
parent 1aabc0672e17c2b931eae19d39da8713f9ff40a0
Author: feld <feld@feld.me>
Date:   Fri,  9 Oct 2020 22:35:09 +0000

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

Diffstat:

Mlib/pleroma/emails/admin_email.ex2+-
Mtest/emails/admin_email_test.exs2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 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 @@ -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