فهرست منبع

display website_from on alias log

Son NK 5 سال پیش
والد
کامیت
7f908a9da8
3فایلهای تغییر یافته به همراه4 افزوده شده و 1 حذف شده
  1. 1 1
      app/dashboard/templates/dashboard/alias_log.html
  2. 2 0
      app/dashboard/views/alias_log.py
  3. 1 0
      email_handler.py

+ 1 - 1
app/dashboard/templates/dashboard/alias_log.html

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

+ 2 - 0
app/dashboard/views/alias_log.py

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

+ 1 - 0
email_handler.py

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