From 339b02d815fe4bf7720f13eb23b7a9908df5e7f8 Mon Sep 17 00:00:00 2001
From: Iain Learmonth <irl@sr2.uk>
Date: Tue, 27 Sep 2022 09:19:46 +0100
Subject: [PATCH] portal: show pool in lists

---
 app/portal/list.py                  | 8 --------
 app/portal/templates/tables.html.j2 | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/portal/list.py b/app/portal/list.py
index 20836c1..f978b2e 100644
--- a/app/portal/list.py
+++ b/app/portal/list.py
@@ -48,14 +48,6 @@ def list_list() -> ResponseReturnValue:
                            item="distribution list",
                            new_link=url_for("portal.list.list_new"),
                            items=lists,
-                           extra_buttons=[
-                               {
-                                   "link": url_for("portal.list.list_preview", format_=k),
-                                   "text": f"Preview {v}",
-                                   "style": "secondary"
-                               }
-                               for k, v in MirrorList.formats_supported.items()
-                           ],
                            **_SECTION_TEMPLATE_VARS
                            )
 
diff --git a/app/portal/templates/tables.html.j2 b/app/portal/templates/tables.html.j2
index 614e81a..fbd656d 100644
--- a/app/portal/templates/tables.html.j2
+++ b/app/portal/templates/tables.html.j2
@@ -363,6 +363,7 @@
             <thead>
             <tr>
                 <th scope="col">Origin Domain Name</th>
+                <th scope="col">Pool</th>
                 <th scope="col">Group</th>
                 <th scope="col">Provider</th>
                 <th scope="col">URL</th>
@@ -381,6 +382,7 @@
                                rel="noopener noreferer">⎋</a>
                             <a href="{{ url_for("portal.origin.origin_edit", origin_id=proxy.origin.id) }}">{{ proxy.origin.domain_name }}</a>
                         </td>
+                        <td>{{ proxy.pool.pool_name }}</td>
                         <td>
                             <a href="{{ url_for("portal.group.group_edit", group_id=proxy.origin.group.id) }}">{{ proxy.origin.group.group_name }}</a>
                         </td>
@@ -538,6 +540,7 @@
         <table class="table table-striped table-sm">
             <thead>
             <tr>
+                <th scope="col">Pool</th>
                 <th scope="col">Provider</th>
                 <th scope="col">Format</th>
                 <th scope="col">Encoding</th>
@@ -550,6 +553,7 @@
             {% for list in mirrorlists %}
                 {% if not list.destroyed %}
                     <tr class="align-middle">
+                        <td>{{ list.pool.pool_name }}</td>
                         <td>{{ list.provider | provider_name }}</td>
                         <td>{{ list.format | format_name }}</td>
                         <td>{{ list.encoding | list_encoding_name }}</td>
@@ -558,6 +562,8 @@
                         <td>
                             <a href="{{ url_for("portal.list.list_edit", list_id=list.id) }}"
                                class="btn btn-primary btn-sm">View/Edit</a>
+                            <a href="{{ url_for("portal.list.list_preview", format_=list.format, pool_id=list.pool.id) }}"
+                               class="btn btn-secondary btn-sm">Preview</a>
                             <a href="{{ url_for("portal.list.list_destroy", list_id=list.id) }}"
                                class="btn btn-danger btn-sm">Destroy</a>
                         </td>