ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-02-20 09:46:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated the System Platform Information section of the Platform and Endorsement details page. Both pages had a field for Serial NR which was listed as optional in the code and wasn't being populated by any data. The Platform page now checks for the type of certificate and displays either the platform or the chassis serial number and the Serial NR section was removed from the Endorsement as there was no equivalent serial number.

Browse Source
This commit is contained in:
Taruan Matthews 2019-03-28 07:06:29 -04:00
parent bc717c9241
commit 97e5d7d48c
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp
View File

@ -242,7 +242,6 @@
<div id="manufacturer">Manufacturer:&nbsp;<span>${initialData.manufacturer}</span></div>
<div id="model">Model:&nbsp;<span>${initialData.model}</span></div>
<div id="version">Version:&nbsp;<span>${initialData.version}</span></div>
<div id="serial">Serial NR:&nbsp;<span><!-- optional --></span></div>
</div>
</div>
<div class="row">
@ -355,32 +354,21 @@
</div>
</div>
<div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">System Information</span></div>
<div class="col-md-1 col-md-offset-1"><span class="colHeader">System Platform Information</span></div>
<div id="subjectAltName" class="col col-md-8">
<div id="manufacturer">Manufacturer:&nbsp;<span>${initialData.manufacturer}</span></div>
<div id="model">Model:&nbsp;<span>${initialData.model}</span></div>
<div id="version">Version:&nbsp;<span>${initialData.version}</span></div>
<div id="serial">Serial NR:&nbsp;<span><!-- optional --></span></div>
<c:choose>
<c:when test="${fn:contains(initialData.credentialType, 'TCG')}">
<div id="serial">Serial Number:&nbsp;<span>${initialData.platformSerial}</span></div>
</c:when>
<c:otherwise>
<div id="serial">Serial Number:&nbsp;<span>${initialData.chassisSerialNumber}</span></div>
</c:otherwise>
</c:choose>
</div>
</div>
<c:choose>
<c:when test="${fn:contains(initialData.credentialType, 'TCG')}">
<div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">System Serial Number</span></div>
<div id="platformSerial" class="col col-md-8 vertical">${initialData.platformSerial}</div>
</div>
</c:when>
<c:otherwise>
<div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Platform Serial Number</span></div>
<div id="platformSerial" class="col col-md-8 vertical">${initialData.platformSerial}</div>
</div>
<div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">Chassis Serial Number</span></div>
<div id="chassisSerialNumber" class="col col-md-8 vertical">${initialData.chassisSerialNumber}</div>
</div>
</c:otherwise>
</c:choose>
</div>
<div class="row">
<div class="col-md-1 col-md-offset-1"><span class="colHeader">TCG Credential Specification Version</span></div>
<div id="majorVersion" class="col col-md-8 vertical">${initialData.majorVersion}.${initialData.minorVersion}.${initialData.revisionLevel}</div>