From 1b203f0d30acca861fa96e73e3ac752ddaa77551 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Mon, 6 Dec 2021 22:39:40 -0800 Subject: [PATCH] fix(requests): show unlinked pkgname when PackageBase has been deleted Signed-off-by: Kevin Morris --- templates/partials/packages/requests.html | 16 +++++++++++----- templates/requests.html | 17 +++++++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/templates/partials/packages/requests.html b/templates/partials/packages/requests.html index 5188a476..4084e96f 100644 --- a/templates/partials/packages/requests.html +++ b/templates/partials/packages/requests.html @@ -15,11 +15,17 @@ {% for request in requests %} {% set requested = request.RequestTS | dt | as_timezone(timezone) %} - - - {{ request.PackageBase.Name }} - - + {% if request.PackageBase %} + {# If the PackageBase still exists, link to it. #} + + + {{ request.PackageBaseName }} + + + {% else %} + {# Otherwise, just display PackageBaseName unlinked. #} + {{ request.PackageBaseName }} + {% endif %} {{ request.RequestType.name_display() | tr }} {# If the RequestType is a merge and request.MergeBaseName is valid... #} diff --git a/templates/requests.html b/templates/requests.html index 74ea6416..09448b6d 100644 --- a/templates/requests.html +++ b/templates/requests.html @@ -23,12 +23,17 @@ {% for result in results %} - - {# Package #} - - {{ result.PackageBaseName }} - - + {% if result.PackageBase %} + {# If the PackageBase still exists, link to it. #} + + + {{ result.PackageBaseName }} + + + {% else %} + {# Otherwise, just display PackageBaseName unlinked. #} + {{ result.PackageBaseName }} + {% endif %} {# Type #} {{ result.RequestType.name_display() | tr }}