add: Output username on Support Training and Support History pages

Change-Id: I9f0a10222c88a3d6d8e351ec796904530cafab53

diff --git a/src/org/cacert/gigi/pages/account/History.java b/src/org/cacert/gigi/pages/account/History.java
index 520e3a549b3f7a73c453a51d4a9592da31e5ded8..470ed1c6cb91add8d0e6a106556af1323a156fcd 100644 (file)
--- a/src/org/cacert/gigi/pages/account/History.java
+++ b/src/org/cacert/gigi/pages/account/History.java
@@ -6,10 +6,8 @@ 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;
 
@@ -30,7 +28,8 @@ public class History extends Page {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        CertificateOwner u;
+        User u;
+        HashMap<String, Object> vars = new HashMap<>();
         if (support) {
             String info = req.getPathInfo();
             int id = Integer.parseInt(info.substring(intStart, info.length() - SUPPORT_PATH.length() + intStart + 1));
@@ -39,11 +38,11 @@ public class History extends Page {
                 resp.sendError(404);
                 return;
             }
+            vars.put("username", u.getPreferredName().toString());
         } else {
-            u = LoginPage.getAuthorizationContext(req).getTarget();
+            u = getUser(req);
         }
         String[] adminLog = u.getAdminLog();
-        HashMap<String, Object> vars = new HashMap<>();
         vars.put("entries", new OutputableArrayIterable(adminLog, "entry"));
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }

diff --git a/src/org/cacert/gigi/pages/account/History.templ b/src/org/cacert/gigi/pages/account/History.templ
index d6fe85af2c3d62e6270a8a5e1466be92f5810cdb..90f1892941777fbeb09292568711599258fb97b8 100644 (file)
--- a/src/org/cacert/gigi/pages/account/History.templ
+++ b/src/org/cacert/gigi/pages/account/History.templ
@@ -1,6 +1,6 @@
 <table class="table">
 <tbody>
-<tr><th><?=_Support actions?></th></tr>
+<tr><th><? if($username) { ?><?=_Support actions for ${username}?><? } else { ?><?=_Support actions?><? } ?></th></tr>
 <? foreach($entries) { ?>
 <tr><td><?=$entry?></td></tr>
 <? } ?>

diff --git a/src/org/cacert/gigi/pages/account/UserTrainings.java b/src/org/cacert/gigi/pages/account/UserTrainings.java
index 3a0a450be05fe3975559b71cd8e199d1e2205b7f..fca2d24f2cf306d0d03379a781f212843a37d7cb 100644 (file)
--- a/src/org/cacert/gigi/pages/account/UserTrainings.java
+++ b/src/org/cacert/gigi/pages/account/UserTrainings.java
@@ -29,6 +29,7 @@ public class UserTrainings extends Page {
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         User u;
+        HashMap<String, Object> vars = new HashMap<>();
         if (support) {
             String info = req.getPathInfo();
             int id = Integer.parseInt(info.substring(intStart, info.length() - SUPPORT_PATH.length() + intStart + 1));
@@ -37,10 +38,10 @@ public class UserTrainings extends Page {
                 resp.sendError(404);
                 return;
             }
+            vars.put("username", u.getPreferredName().toString());
         } else {
             u = getUser(req);
         }
-        HashMap<String, Object> vars = new HashMap<>();
         vars.put("entries", new OutputableArrayIterable(u.getTrainings(), "entry"));
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }

diff --git a/src/org/cacert/gigi/pages/account/UserTrainings.templ b/src/org/cacert/gigi/pages/account/UserTrainings.templ
index 0e2667a0137d16472d767abcbe0c901b2611eb65..58de7ddf1f7bd89afae7f59a504aa5d439fed011 100644 (file)
--- a/src/org/cacert/gigi/pages/account/UserTrainings.templ
+++ b/src/org/cacert/gigi/pages/account/UserTrainings.templ
@@ -1,6 +1,6 @@
 <table class="table">
 <tbody>
-<tr><th><?=_Trainings?></th></tr>
+<tr><th><? if($username) { ?><?=_Trainings of ${username}?><? } else { ?><?=_Trainings?><? } ?></th></tr>
 <? foreach($entries) { ?>
 <tr><td><?=$entry?></td></tr>
 <? } ?>