remove uses of website_from
This commit is contained in:
parent
18844b7011
commit
2619333cc6
|
@ -134,11 +134,13 @@ def alias_contact_manager(alias_id):
|
||||||
url_for("dashboard.alias_contact_manager", alias_id=alias_id)
|
url_for("dashboard.alias_contact_manager", alias_id=alias_id)
|
||||||
)
|
)
|
||||||
|
|
||||||
contact_name = contact.website_from
|
delete_contact_email = contact.website_email
|
||||||
Contact.delete(contact_id)
|
Contact.delete(contact_id)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
flash(f"Reverse-alias for {contact_name} has been deleted", "success")
|
flash(
|
||||||
|
f"Reverse-alias for {delete_contact_email} has been deleted", "success"
|
||||||
|
)
|
||||||
|
|
||||||
return redirect(
|
return redirect(
|
||||||
url_for("dashboard.alias_contact_manager", alias_id=alias_id)
|
url_for("dashboard.alias_contact_manager", alias_id=alias_id)
|
||||||
|
|
|
@ -10,7 +10,6 @@ from app.models import Alias, EmailLog, Contact
|
||||||
|
|
||||||
class AliasLog:
|
class AliasLog:
|
||||||
website_email: str
|
website_email: str
|
||||||
website_from: str
|
|
||||||
reverse_alias: str
|
reverse_alias: str
|
||||||
alias: str
|
alias: str
|
||||||
when: arrow.Arrow
|
when: arrow.Arrow
|
||||||
|
@ -78,7 +77,6 @@ def get_alias_log(alias: Alias, page_id=0):
|
||||||
for contact, email_log in q:
|
for contact, email_log in q:
|
||||||
al = AliasLog(
|
al = AliasLog(
|
||||||
website_email=contact.website_email,
|
website_email=contact.website_email,
|
||||||
website_from=contact.website_from,
|
|
||||||
reverse_alias=contact.website_send_to(),
|
reverse_alias=contact.website_send_to(),
|
||||||
alias=alias.email,
|
alias=alias.email,
|
||||||
when=email_log.created_at,
|
when=email_log.created_at,
|
||||||
|
|
|
@ -157,7 +157,7 @@ def replace_header_when_forward(msg: Message, alias: Alias, header: str):
|
||||||
|
|
||||||
contact = Contact.get_by(alias_id=alias.id, website_email=contact_email)
|
contact = Contact.get_by(alias_id=alias.id, website_email=contact_email)
|
||||||
if contact:
|
if contact:
|
||||||
# update the website_from if needed
|
# update the contact name if needed
|
||||||
if contact.name != contact_name:
|
if contact.name != contact_name:
|
||||||
LOG.d(
|
LOG.d(
|
||||||
"Update contact %s name %s to %s",
|
"Update contact %s name %s to %s",
|
||||||
|
|
Loading…
Reference in New Issue