diff --git a/app/dashboard/templates/dashboard/alias_contact_manager.html b/app/dashboard/templates/dashboard/alias_contact_manager.html index ece20e29..9b2edb99 100644 --- a/app/dashboard/templates/dashboard/alias_contact_manager.html +++ b/app/dashboard/templates/dashboard/alias_contact_manager.html @@ -92,43 +92,39 @@ +
- Contact created {{ contact.created_at | dt }} + {% if contact_info.latest_email_log != None %} + {% set email_log = contact_info.latest_email_log %} + + {% if email_log.is_reply %} + + {{ email_log.created_at | dt }} + {% elif email_log.bounced %} + + + {{ email_log.created_at | dt }} + + {% elif email_log.blocked %} + + {{ email_log.created_at | dt }} + {% else %} + + {{ email_log.created_at | dt }} + {% endif %} +
+ Contact created {{ contact.created_at | dt }} + {% else %} + No Activity. Contact created {{ contact.created_at | dt }} + {% endif %} + +
+ {{ contact_info.nb_forward }} forwards, + {{ contact_info.nb_reply }} replies +
- -{#
#} -{# {% if contact_info.latest_email_log != None %}#} -{# {% set email_log = contact_info.latest_email_log %}#} -{##} -{# {% if email_log.is_reply %}#} -{# #} -{# {{ email_log.created_at | dt }}#} -{# {% elif email_log.bounced %}#} -{# #} -{# #} -{# {{ email_log.created_at | dt }}#} -{# #} -{# {% elif email_log.blocked %}#} -{# #} -{# {{ email_log.created_at | dt }}#} -{# {% else %}#} -{# #} -{# {{ email_log.created_at | dt }}#} -{# {% endif %}#} -{#
#} -{# Contact created {{ contact.created_at | dt }}#} -{# {% else %}#} -{# No Activity. Contact created {{ contact.created_at | dt }}#} -{# {% endif %}#} -{##} -{#
#} -{# {{ contact_info.nb_forward }} forwards,#} -{# {{ contact_info.nb_reply }} replies#} -{#
#} -{#
#} - Edit ➡
diff --git a/app/dashboard/views/alias_contact_manager.py b/app/dashboard/views/alias_contact_manager.py index 3566813f..13a0effa 100644 --- a/app/dashboard/views/alias_contact_manager.py +++ b/app/dashboard/views/alias_contact_manager.py @@ -61,26 +61,6 @@ class ContactInfo(object): def get_contact_infos(alias: Alias, page=0, contact_id=None) -> [ContactInfo]: - q = db.session.query( - Contact, - ).filter(Contact.alias_id == alias.id) - - if contact_id: - q = q.filter(Contact.id == contact_id) - - q = q.order_by(Contact.id.desc()).limit(PAGE_LIMIT).offset(page * PAGE_LIMIT) - - ret = [] - for contact in q: - contact_info = ContactInfo( - contact=contact, nb_forward=0, nb_reply=0, latest_email_log=None - ) - ret.append(contact_info) - - return ret - - -def get_contact_infos2(alias: Alias, page=0, contact_id=None) -> [ContactInfo]: """if contact_id is set, only return the contact info for this contact""" sub = ( db.session.query(