corrected JavaScript issue with big numbers

This patch corrects key IDs miscalculated by JavaScript for key search results and key record views.

Bug: 951501.

4 files changed, 9 insertions, 9 deletions

diff --git a/base/kra/shared/webapps/kra/agent/kra/displayBySerial.template b/base/kra/shared/webapps/kra/agent/kra/displayBySerial.template
index 117535fa1..d3fb74407 100644
--- a/base/kra/shared/webapps/kra/agent/kra/displayBySerial.template
+++ b/base/kra/shared/webapps/kra/agent/kra/displayBySerial.template
@@ -31,7 +31,7 @@ function toHex(number)
 
 function renderHexNumber(number,width)
 {
-    var num = toHex(number);
+    var num = number;
     while (num.length < width)
         num = "0"+num;
     return "0x"+num;
@@ -57,7 +57,7 @@ if (result.header.errorDetails != null) {
 	'?op=displayBySerial&serialNumber=' + result.header.serialNumber + '"' +
         'onMouseOver=" return helpstatus(\'Click to redisplay this ' +
         'request \')" onMouseOut="return helpstatus(\'\')">' +
-        renderHexNumber(result.header.serialNumber,8) +
+        renderHexNumber(result.header.serialNumberInHex,8) +
         '</a></font></font>');
 	document.writeln('<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" BACKGROUND="/pki/images/hr.gif"><TR><TD>&nbsp;</TD></TR></TABLE>');
 
diff --git a/base/kra/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template b/base/kra/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
index 125e02e4a..938a0be1d 100644
--- a/base/kra/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/displayBySerialForRecovery.template
@@ -43,7 +43,7 @@ function toHex(number)
 
 function renderHexNumber(number,width)
 {
-    var num = toHex(number);
+    var num = number;
     while (num.length < width)
         num = "0"+num;
     return "0x"+num;
diff --git a/base/kra/shared/webapps/kra/agent/kra/srchKey.template b/base/kra/shared/webapps/kra/agent/kra/srchKey.template
index f9d39e194..b58961fcc 100644
--- a/base/kra/shared/webapps/kra/agent/kra/srchKey.template
+++ b/base/kra/shared/webapps/kra/agent/kra/srchKey.template
@@ -48,7 +48,7 @@ function renderOidName(oid)
 
 function renderHexNumber(number,width)
 {
-    var num = toHex(number);
+    var num = number;
     while (num.length < width)
 	num = "0"+num;
     return "0x"+num;
@@ -107,8 +107,8 @@ function displayKeyRecord(rec)
 	document.write('</tr>');
 
 	document.write('<tr>');
-	// document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif"><a href="' + '/kra/agent/kra/displayBySerial?' + 'op=displayBySerial&serialNumber=' + rec.serialNumber + '">' + renderHexNumber(rec.serialNumber,8) + '</a></font></td>');
-	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(rec.serialNumber,8) + '</font></td>');
+	// document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif"><a href="' + '/kra/agent/kra/displayBySerial?' + 'op=displayBySerial&serialNumber=' + rec.serialNumber + '">' + renderHexNumber(rec.serialNumberInHex,8) + '</a></font></td>');
+	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(rec.serialNumberInHex,8) + '</font></td>');
 	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + rec.state + '</font></td>');
 	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderDateFromSecs(rec.archivedOn) + '</font></td>');
 	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderDateFromSecs(rec.archivedOn) + '</font></td>');
diff --git a/base/kra/shared/webapps/kra/agent/kra/srchKeyForRecovery.template b/base/kra/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
index a4605ff9a..a0598b915 100644
--- a/base/kra/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
+++ b/base/kra/shared/webapps/kra/agent/kra/srchKeyForRecovery.template
@@ -47,7 +47,7 @@ function renderOidName(oid)
 
 function renderHexNumber(number,width)
 {
-    var num = toHex(number);
+    var num = number;
     while (num.length < width)
 	num = "0"+num;
     return "0x"+num;
@@ -120,8 +120,8 @@ function displayKeyRecord(rec)
 	document.write('</tr>');
 
 	document.write('<tr>');
-	// document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif"><a href="' + '/kra/agent/kra/displayBySerialForRecovery?' + 'op=displayBySerialForRecovery&serialNumber=' + rec.serialNumber + '">' + renderHexNumber(rec.serialNumber,8) + '</a></font></td>');
-	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(rec.serialNumber,8) + '</font></td>');
+	// document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif"><a href="' + '/kra/agent/kra/displayBySerialForRecovery?' + 'op=displayBySerialForRecovery&serialNumber=' + rec.serialNumber + '">' + renderHexNumber(rec.serialNumberInHex,8) + '</a></font></td>');
+	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderHexNumber(rec.serialNumberInHex,8) + '</font></td>');
 	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + rec.state + '</font></td>');
 	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderDateFromSecs(rec.archivedOn) + '</font></td>');
 	document.write('<td align=left><font size="-1" face="PrimaSans BT, Verdana, sans-serif">' + renderDateFromSecs(rec.archivedOn) + '</font></td>');