fix(requests): show unlinked pkgname when PackageBase has been deleted

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-12-06 22:39:40 -08:00
parent 2df54bd7a0
commit 1b203f0d30
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 22 additions and 11 deletions

View file

@ -15,11 +15,17 @@
{% for request in requests %} {% for request in requests %}
{% set requested = request.RequestTS | dt | as_timezone(timezone) %} {% set requested = request.RequestTS | dt | as_timezone(timezone) %}
<tr> <tr>
{% if request.PackageBase %}
{# If the PackageBase still exists, link to it. #}
<td> <td>
<a href="/pkgbase/{{ request.PackageBase.Name }}"> <a href="/pkgbase/{{ request.PackageBaseName }}">
{{ request.PackageBase.Name }} {{ request.PackageBaseName }}
</a> </a>
</td> </td>
{% else %}
{# Otherwise, just display PackageBaseName unlinked. #}
<td>{{ request.PackageBaseName }}</td>
{% endif %}
<td> <td>
{{ request.RequestType.name_display() | tr }} {{ request.RequestType.name_display() | tr }}
{# If the RequestType is a merge and request.MergeBaseName is valid... #} {# If the RequestType is a merge and request.MergeBaseName is valid... #}

View file

@ -23,12 +23,17 @@
<tbody> <tbody>
{% for result in results %} {% for result in results %}
<tr> <tr>
{% if result.PackageBase %}
{# If the PackageBase still exists, link to it. #}
<td> <td>
{# Package #}
<a href="/pkgbase/{{ result.PackageBaseName }}"> <a href="/pkgbase/{{ result.PackageBaseName }}">
{{ result.PackageBaseName }} {{ result.PackageBaseName }}
</a> </a>
</td> </td>
{% else %}
{# Otherwise, just display PackageBaseName unlinked. #}
<td>{{ result.PackageBaseName }}</td>
{% endif %}
{# Type #} {# Type #}
<td> <td>
{{ result.RequestType.name_display() | tr }} {{ result.RequestType.name_display() | tr }}