From efa2cada2d513ec53049e68b521efa5ad5aca9c8 Mon Sep 17 00:00:00 2001 From: Cyrus <24922493+cyrus-dev@users.noreply.github.com> Date: Fri, 21 May 2021 06:40:06 -0400 Subject: [PATCH] Updated the Rel Link References for the swid tag details pages. The previous set up didn't discern between a tag id and an actual url. --- .../src/main/webapp/WEB-INF/jsp/rim-details.jsp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp index fee09571..a1db77c5 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp @@ -334,7 +334,17 @@ <div class="col-md-1 col-md-offset-1"><span class="colHeader">Link</span></div> <div id="link" class="col col-md-8"> <c:if test="${not empty initialData.linkHref}"> - <div><span><a href="${portal}/rim-details?id=${initialData.linkHrefLink}" rel="${initialData.linkRel}">${initialData.linkHref}</a></span> + <div> + <span> + <c:choose> + <c:when test="${initialData.linkRel=='requires'}"> + <a href="${portal}/rim-details?id=${initialData.linkHrefLink}" rel="${initialData.linkRel}">${initialData.linkHref}</a> + </c:when> + <c:otherwise> + <a href="${initialData.linkHref}" rel="${initialData.linkRel}">${initialData.linkHref}</a> + </c:otherwise> + </c:choose> + </span> </div> <div>Rel: <span>${initialData.linkRel}</span> </div>