Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

display website_from on alias log

This commit is contained in:
Son NK 2019-12-09 22:40:49 +01:00
parent d160971cc7
commit 7f908a9da8
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/dashboard/templates/dashboard/alias_log.html
View File

@ -19,7 +19,7 @@
<div class="my-2 p-2 card"> <div class="my-2 p-2 card">
<div class="font-weight-bold">{{ log.when | dt }}</div> <div class="font-weight-bold">{{ log.when | dt }}</div>
<div> <div>
<span class="mr-2">{{ log.website_email }}</span> <span class="mr-2">{{ log.website_from or log.website_email }}</span>
<span> <span>
{% if log.is_reply %} {% if log.is_reply %}

2
app/dashboard/views/alias_log.py
View File

@ -12,6 +12,7 @@ from app.models import GenEmail, ForwardEmailLog, ForwardEmail
@dataclass @dataclass
class AliasLog: class AliasLog:
website_email: str website_email: str
website_from: str
alias: str alias: str
when: arrow.Arrow when: arrow.Arrow
is_reply: bool is_reply: bool
@ -50,6 +51,7 @@ def get_alias_log(gen_email: GenEmail):
for fe, fel in q: for fe, fel in q:
al = AliasLog( al = AliasLog(
website_email=fe.website_email, website_email=fe.website_email,
website_from=fe.website_from,
alias=gen_email.email, alias=gen_email.email,
when=fel.created_at, when=fel.created_at,
is_reply=fel.is_reply, is_reply=fel.is_reply,

1
email_handler.py
View File

@ -104,6 +104,7 @@ class MailHandler:
forward_email = ForwardEmail.create( forward_email = ForwardEmail.create(
gen_email_id=gen_email.id, gen_email_id=gen_email.id,
website_email=website_email, website_email=website_email,
website_from=msg["From"],
reply_email=reply_email, reply_email=reply_email,
) )
db.session.commit() db.session.commit()