From 97e5d7d48c72634f5773eff8eec4f4689e951386 Mon Sep 17 00:00:00 2001 From: Taruan Matthews Date: Thu, 28 Mar 2019 07:06:29 -0400 Subject: [PATCH 1/2] 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. --- .../WEB-INF/jsp/certificate-details.jsp | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp index df2283e2..f323b589 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp @@ -242,7 +242,6 @@
Manufacturer: ${initialData.manufacturer}
Model: ${initialData.model}
Version: ${initialData.version}
-
Serial NR: 
@@ -355,32 +354,21 @@
-
System Information
+
System Platform Information
Manufacturer: ${initialData.manufacturer}
Model: ${initialData.model}
Version: ${initialData.version}
-
Serial NR: 
+ + +
Serial Number: ${initialData.platformSerial}
+ + +
Serial Number: ${initialData.chassisSerialNumber}
+ +
-
- - -
-
System Serial Number
-
${initialData.platformSerial}
-
- - -
-
Platform Serial Number
-
${initialData.platformSerial}
-
-
-
Chassis Serial Number
-
${initialData.chassisSerialNumber}
-
- - +
TCG Credential Specification Version
${initialData.majorVersion}.${initialData.minorVersion}.${initialData.revisionLevel}
From 002a4b735ce145eb745257d5b9d9f060b91f6bbe Mon Sep 17 00:00:00 2001 From: Taruan Matthews Date: Thu, 28 Mar 2019 11:09:48 -0400 Subject: [PATCH 2/2] Removed chassisSerialNumber --- .../src/main/webapp/WEB-INF/jsp/certificate-details.jsp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp index f323b589..cbbf92a6 100644 --- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp +++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/certificate-details.jsp @@ -359,14 +359,7 @@
Manufacturer: ${initialData.manufacturer}
Model: ${initialData.model}
Version: ${initialData.version}
- - -
Serial Number: ${initialData.platformSerial}
- - -
Serial Number: ${initialData.chassisSerialNumber}
- - +
Serial Number: ${initialData.platformSerial}