jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

portal: show pool in lists

Browse source
This commit is contained in:
Iain Learmonth 2022-09-27 09:19:46 +01:00
parent 082eff218a
commit 339b02d815
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/portal/list.py
View file

@ -48,14 +48,6 @@ def list_list() -> ResponseReturnValue:
item="distribution list", item="distribution list",
new_link=url_for("portal.list.list_new"), new_link=url_for("portal.list.list_new"),
items=lists, 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 **_SECTION_TEMPLATE_VARS
) )

6
app/portal/templates/tables.html.j2
View file

@ -363,6 +363,7 @@
<thead> <thead>
<tr> <tr>
<th scope="col">Origin Domain Name</th> <th scope="col">Origin Domain Name</th>
<th scope="col">Pool</th>
<th scope="col">Group</th> <th scope="col">Group</th>
<th scope="col">Provider</th> <th scope="col">Provider</th>
<th scope="col">URL</th> <th scope="col">URL</th>
@ -381,6 +382,7 @@
rel="noopener noreferer">⎋</a> rel="noopener noreferer">⎋</a>
<a href="{{ url_for("portal.origin.origin_edit", origin_id=proxy.origin.id) }}">{{ proxy.origin.domain_name }}</a> <a href="{{ url_for("portal.origin.origin_edit", origin_id=proxy.origin.id) }}">{{ proxy.origin.domain_name }}</a>
</td> </td>
<td>{{ proxy.pool.pool_name }}</td>
<td> <td>
<a href="{{ url_for("portal.group.group_edit", group_id=proxy.origin.group.id) }}">{{ proxy.origin.group.group_name }}</a> <a href="{{ url_for("portal.group.group_edit", group_id=proxy.origin.group.id) }}">{{ proxy.origin.group.group_name }}</a>
</td> </td>
@ -538,6 +540,7 @@
<table class="table table-striped table-sm"> <table class="table table-striped table-sm">
<thead> <thead>
<tr> <tr>
<th scope="col">Pool</th>
<th scope="col">Provider</th> <th scope="col">Provider</th>
<th scope="col">Format</th> <th scope="col">Format</th>
<th scope="col">Encoding</th> <th scope="col">Encoding</th>
@ -550,6 +553,7 @@
{% for list in mirrorlists %} {% for list in mirrorlists %}
{% if not list.destroyed %} {% if not list.destroyed %}
<tr class="align-middle"> <tr class="align-middle">
<td>{{ list.pool.pool_name }}</td>
<td>{{ list.provider | provider_name }}</td> <td>{{ list.provider | provider_name }}</td>
<td>{{ list.format | format_name }}</td> <td>{{ list.format | format_name }}</td>
<td>{{ list.encoding | list_encoding_name }}</td> <td>{{ list.encoding | list_encoding_name }}</td>
@ -558,6 +562,8 @@
<td> <td>
<a href="{{ url_for("portal.list.list_edit", list_id=list.id) }}" <a href="{{ url_for("portal.list.list_edit", list_id=list.id) }}"
class="btn btn-primary btn-sm">View/Edit</a> 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) }}" <a href="{{ url_for("portal.list.list_destroy", list_id=list.id) }}"
class="btn btn-danger btn-sm">Destroy</a> class="btn btn-danger btn-sm">Destroy</a>
</td> </td>