From 6d7ee0b76a9798d9dbe1d21243eb2822e5a7566b Mon Sep 17 00:00:00 2001
From: Santiago Lamora <santiago@ribaguifi.com>
Date: Mon, 27 Sep 2021 13:37:11 +0200
Subject: [PATCH] Refactor Addresses list view

---
 musician/models.py                         |  7 +++++-
 musician/templates/musician/addresses.html | 26 ++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/musician/models.py b/musician/models.py
index a470a65..9742f8c 100644
--- a/musician/models.py
+++ b/musician/models.py
@@ -231,7 +231,12 @@ class Address(OrchestraModel):
     verbose_name = _('Mail addresses')
     description = _('Description details for mail addresses page.')
     fields = ('mail_address', 'aliases', 'type', 'type_detail')
-    param_defaults = {"id": None,}
+    param_defaults = {
+        "id": None,
+        "domain": None,
+        "mailboxes": [],
+        "forward": None,
+    }
 
     FORWARD = 'forward'
     MAILBOX = 'mailbox'
diff --git a/musician/templates/musician/addresses.html b/musician/templates/musician/addresses.html
index 3c2e6f5..5c0c757 100644
--- a/musician/templates/musician/addresses.html
+++ b/musician/templates/musician/addresses.html
@@ -6,31 +6,29 @@
   <table class="table service-list">
     <colgroup>
       <col span="1" style="width: 25%;">
-      <col span="1" style="width: 50%;">
-      <col span="1" style="width: 5%;">
-      <col span="1" style="width: 20%;">
+      <col span="1" style="width: 25%;">
+      <col span="1" style="width: 25%;">
+      <col span="1" style="width: 25%;">
     </colgroup>
     <thead class="thead-dark">
       <tr>
-        <th scope="col">{% trans "Mail address" %}</th>
-        <th scope="col">{% trans "Aliases" %}</th>
-        <th scope="col">{% trans "Type" %}</th>
-        <th scope="col">{% trans "Type details" %}</th>
+        <th scope="col">{% trans "Email" %}</th>
+        <th scope="col">{% trans "Domain" %}</th>
+        <th scope="col">{% trans "Mailboxes" %}</th>
+        <th scope="col">{% trans "Forward" %}</th>
       </tr>
     </thead>
     <tbody>
       {% for obj in object_list %}
       <tr>
         <td><a href="{% url 'musician:mail-update' obj.id %}">{{ obj.mail_address }}</a></td>
-        <td>{{ obj.aliases|join:" , " }}</td>
-        <td>{{ obj.type|capfirst }}</td>
+        <td>{{ obj.domain.name }}</td>
         <td>
-          {% if obj.type == 'mailbox' %}
-          {% include "musician/components/usage_progress_bar.html" with detail=obj.type_detail %}
-          {% else %}
-          {{ obj.type_detail }}
-          {% endif %}
+          {% for mailbox in obj.mailboxes %}
+            <a href="#TODO-mailbox-detail-{{ mailbox.id }}">{{ mailbox.name }}</a>
+          {% endfor %}
         </td>
+        <td>{{ obj.forward }}</td>
       </tr>
       {% endfor %}
     </tbody>