From: Janis Streib <janis@dogcraft.de>
Date: Thu, 4 Jun 2015 20:26:50 +0000 (+0200)
Subject: UPD: Only show revoke checkboxes, if the cert is in an revokable state
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=b0ef15735933668691360622be28aa104ae24416

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 4dda163c..380b7a77 100644
--- 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("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()));
diff --git a/src/org/cacert/gigi/output/CertificateTable.templ b/src/org/cacert/gigi/output/CertificateTable.templ
index d48f05c7..1917d1fe 100644
--- a/src/org/cacert/gigi/output/CertificateTable.templ
+++ b/src/org/cacert/gigi/output/CertificateTable.templ
@@ -15,7 +15,7 @@
 <? 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>