X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2FUserTrainings.java;h=fca2d24f2cf306d0d03379a781f212843a37d7cb;hb=4974563cbde29b9798b7015b1b01982702f3a3d3;hp=8c117d5ee53ac3216eff8891c0a65d35f140573d;hpb=47c7ef9db6c7a688853f338495ba61e3d827b2d2;p=gigi.git diff --git a/src/org/cacert/gigi/pages/account/UserTrainings.java b/src/org/cacert/gigi/pages/account/UserTrainings.java index 8c117d5e..fca2d24f 100644 --- 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 vars = new HashMap<>(); if (support) { String info = req.getPathInfo(); int id = Integer.parseInt(info.substring(intStart, info.length() - SUPPORT_PATH.length() + intStart + 1)); @@ -37,16 +38,23 @@ public class UserTrainings extends Page { resp.sendError(404); return; } + vars.put("username", u.getPreferredName().toString()); } else { u = getUser(req); } - HashMap vars = new HashMap<>(); vars.put("entries", new OutputableArrayIterable(u.getTrainings(), "entry")); getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars); } @Override public boolean isPermitted(AuthorizationContext ac) { - return ac != null && ( !support || ac.canSupport()); + if (ac == null) { + return false; + } + if (support) { + return ac.canSupport(); + } else { + return ac.getTarget() instanceof User; + } } }