Merge "upd: remove 'browser install'"

[gigi.git] / src / club / wpia / gigi / pages / admin / support / FindCertPage.java

diff --git a/src/club/wpia/gigi/pages/admin/support/FindCertPage.java b/src/club/wpia/gigi/pages/admin/support/FindCertPage.java
index 0d2edbc9bb9032feeb6701a2c3b304621d43d463..19064a66882f16fbbd97d60a3e59b6e694808f68 100644 (file)
--- a/src/club/wpia/gigi/pages/admin/support/FindCertPage.java
+++ b/src/club/wpia/gigi/pages/admin/support/FindCertPage.java
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import club.wpia.gigi.dbObjects.Certificate;
+import club.wpia.gigi.dbObjects.Certificate.CertificateStatus;
 import club.wpia.gigi.dbObjects.Certificate.SubjectAlternateName;
 import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.output.ArrayIterable;
@@ -56,8 +57,14 @@ public class FindCertPage extends Page {
 
                     @Override
                     public void apply(Certificate t, Language l, Map<String, Object> vars) {
-                        vars.put("id", t.getId());
                         vars.put("serial", t.getSerial());
+                        vars.put("draftinfo", t.getStatus() == CertificateStatus.DRAFT ? l.getTranslation("Draft") : "");
+
+                        if (t.getStatus() == CertificateStatus.REVOKED) {
+                            vars.put("revoked", t.getRevocationDate());
+                        } else {
+                            vars.put("revoked", l.getTranslation("N/A"));
+                        }
 
                         final List<SubjectAlternateName> san = t.getSANs();
                         vars.put("san", new IterableDataset() {