UPD: Only show revoke checkboxes, if the cert is in an revokable state

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 4dda163c9091893cba7b4ce4fbe75c353ee746bb..380b7a77ec5c58fff93334e67a185f8c6a9c75d1 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -33,7 +33,7 @@ public class CertificateIterable implements IterableDataset {
         vars.put("profile", c.getProfile().getVisibleName());
         try {
             CertificateStatus st = c.getStatus();
         vars.put("profile", c.getProfile().getVisibleName());
         try {
             CertificateStatus st = c.getStatus();

-            vars.put("isNotRevoked", st != CertificateStatus.REVOKED);
+            vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);

             if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
                 X509Certificate cert = c.cert();
                 vars.put("issued", DateSelector.getDateFormat().format(cert.getNotBefore()));
             if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
                 X509Certificate cert = c.cert();
                 vars.put("issued", DateSelector.getDateFormat().format(cert.getNotBefore()));

diff --git a/src/org/cacert/gigi/output/CertificateTable.templ b/src/org/cacert/gigi/output/CertificateTable.templ
index d48f05c7e1dd3f95b1f233501db58b7022a659ed..1917d1fe35ae0777cae0c2f414bbf7e8b560fe57 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateTable.templ
+++ b/src/org/cacert/gigi/output/CertificateTable.templ
@@ -15,7 +15,7 @@
 <? foreach($certs) {?>
 <tr>
        <td>
 <? foreach($certs) {?>
 <tr>
        <td>

-       <? if($isNotRevoked) { ?><input type='checkbox' name='certs[]' value='<?=$serial?>'><? } ?>
+       <? if($revokable) { ?><input type='checkbox' name='certs[]' value='<?=$serial?>'><? } ?>

        </td>
        <td><?=$state?></td>
        <td><?=$CN?></td>
        </td>
        <td><?=$state?></td>
        <td><?=$CN?></td>