upd: history also for organisations.

[gigi.git] / src / org / cacert / gigi / pages / account / History.java

diff --git a/src/org/cacert/gigi/pages/account/UserHistory.java b/src/org/cacert/gigi/pages/account/History.java
similarity index 82%
rename from src/org/cacert/gigi/pages/account/UserHistory.java
rename to src/org/cacert/gigi/pages/account/History.java
index 53e81a23c88cef1f3d5a817360c3d0e95010800c..520e3a549b3f7a73c453a51d4a9592da31e5ded8 100644 (file)
--- a/src/org/cacert/gigi/pages/account/UserHistory.java
+++ b/src/org/cacert/gigi/pages/account/History.java
@@ -6,12 +6,14 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.cacert.gigi.dbObjects.CertificateOwner;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.template.OutputableArrayIterable;
+import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.AuthorizationContext;
 
-public class UserHistory extends Page {
+public class History extends Page {
 
     public static final String SUPPORT_PATH = "/support/user/*/history";
 
@@ -21,14 +23,14 @@ public class UserHistory extends Page {
 
     private boolean support;
 
-    public UserHistory(boolean support) {
-        super(support ? "Support user history" : "History");
+    public History(boolean support) {
+        super(support ? "Support History" : "History");
         this.support = support;
     }
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        User u;
+        CertificateOwner u;
         if (support) {
             String info = req.getPathInfo();
             int id = Integer.parseInt(info.substring(intStart, info.length() - SUPPORT_PATH.length() + intStart + 1));
@@ -38,7 +40,7 @@ public class UserHistory extends Page {
                 return;
             }
         } else {
-            u = getUser(req);
+            u = LoginPage.getAuthorizationContext(req).getTarget();
         }
         String[] adminLog = u.getAdminLog();
         HashMap<String, Object> vars = new HashMap<>();