From b9e58e6ae9a4207092d29bbf576e14f5925ae0f3 Mon Sep 17 00:00:00 2001
From: INOPIAE <m.maengel@inopiae.de>
Date: Sun, 14 Aug 2016 08:07:17 +0200
Subject: [PATCH] add: enable that user can see all certificates issued to his
 account

fixes issue #54

Change-Id: Ib19bb63a4f787df4c2292383535f3e06b304f4df
---
 .../certs/CertificateModificationForm.java        | 15 +++++++++++++--
 .../certs/CertificateModificationForm.templ       |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
index a58f3a6c..fc367920 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.java
@@ -17,9 +17,9 @@ import org.cacert.gigi.pages.LoginPage;
 
 public class CertificateModificationForm extends Form {
 
-    CertificateOwner target;
+    private CertificateOwner target;
 
-    final boolean withRevoked;
+    private final boolean withRevoked;
 
     public CertificateModificationForm(HttpServletRequest hsr, boolean withRevoked) {
         super(hsr);
@@ -33,6 +33,10 @@ public class CertificateModificationForm extends Form {
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) {
+        String action = req.getParameter("action");
+        if ( !"revoke".equals(action)) {
+            return false;
+        }
         String[] certs = req.getParameterValues("certs[]");
         if (certs == null) {
             // nothing to do
@@ -63,6 +67,13 @@ public class CertificateModificationForm extends Form {
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         vars.put("certs", new CertificateIterable(target.getCertificates(withRevoked)));
         vars.put("certTable", certTable);
+        if (withRevoked) {
+            vars.put("all", "btn-primary");
+            vars.put("current", "btn-info");
+        } else {
+            vars.put("all", "btn-info");
+            vars.put("current", "btn-primary");
+        }
         myTemplate.output(out, l, vars);
     }
 
diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ
index 76f60b00..d4e2f74e 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateModificationForm.templ
@@ -1,2 +1,3 @@
+<a href="?" class="btn <?=$current?>"><?=_Show Current Certificates?></a> <a href="?withRevoked" class="btn <?=$all?>"><?=_Show All Certificates?></a>
 <?=$certTable?>
-<input type="submit" value="<?=_Revoke Selected Certificates?>"/>
\ No newline at end of file
+<button class="btn btn-danger" name="action" value="revoke"><?=_Revoke Selected Certificates?></button>
-- 
2.39.2