Show profile in certificates table.

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 11c4a507ec2bd0c95792b97c71b3b436931dc6ff..62e7f7057541a474389960c3028d357260156cf1 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -32,6 +32,7 @@ public class CertificateIterable implements IterableDataset {
         vars.put("CN", c.getDistinguishedName());
         vars.put("serial", c.getSerial());
         vars.put("digest", c.getMessageDigest());
         vars.put("CN", c.getDistinguishedName());
         vars.put("serial", c.getSerial());
         vars.put("digest", c.getMessageDigest());

+        vars.put("profile", c.getProfile().getVisibleName());

 
         vars.put("issued", "TODO"); // TODO output dates
         vars.put("revoked", "TODO");
 
         vars.put("issued", "TODO"); // TODO output dates
         vars.put("revoked", "TODO");

diff --git a/src/org/cacert/gigi/output/CertificateTable.templ b/src/org/cacert/gigi/output/CertificateTable.templ
index f2870bba29899795fbbf2f9b364e3b1b904abb9a..29c53eb0f47359b76f6a6c0ad5e882902fcc52cd 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateTable.templ
+++ b/src/org/cacert/gigi/output/CertificateTable.templ
@@ -6,6 +6,7 @@
 <td><?=_Email Address?></td>
 <td><?=_SerialNumber?></td>
 <td><?=_Digest?></td>
 <td><?=_Email Address?></td>
 <td><?=_SerialNumber?></td>
 <td><?=_Digest?></td>

+<td><?=_Profile?></td>

 <td><?=_Issued?></td>
 <td><?=_Revoked?></td>
 <td><?=_Expires?></td>
 <td><?=_Issued?></td>
 <td><?=_Revoked?></td>
 <td><?=_Expires?></td>


@@ -19,6 +20,7 @@
        <td><?=$CN?></td>
        <td><a href='/account/certs/<?=$serial?>'><?=$serial?></a></td>
        <td><?=$digest?></td>
        <td><?=$CN?></td>
        <td><a href='/account/certs/<?=$serial?>'><?=$serial?></a></td>
        <td><?=$digest?></td>

+       <td><?=$profile?></td>

        <td><?=$issued?></td>
        <td><?=$revoked?></td>
        <td><?=$expire?></td>
        <td><?=$issued?></td>
        <td><?=$revoked?></td>
        <td><?=$expire?></td>