X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FMyPoints.java;h=ba2bdf5af5da706d62f91b01dae4b52114741a15;hp=cd8b732e454b3cd4d5209c236fcd3afc7e3c5abc;hb=3689dcd11a286c3c9204f96d9a6c3b33a968844a;hpb=a71868622be6824dcb4cc1ce10bd0c1c473e9d5c

diff --git a/src/org/cacert/gigi/pages/wot/MyPoints.java b/src/org/cacert/gigi/pages/wot/MyPoints.java
index cd8b732e..ba2bdf5a 100644
--- a/src/org/cacert/gigi/pages/wot/MyPoints.java
+++ b/src/org/cacert/gigi/pages/wot/MyPoints.java
@@ -1,24 +1,23 @@
 package org.cacert.gigi.pages.wot;
 
 import java.io.IOException;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.GigiApiException;
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.AssurancesDisplay;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.AuthorizationContext;
 
 public class MyPoints extends Page {
 
     public static final String PATH = "/wot/mypoints";
 
-    private AssurancesDisplay myDisplay = new AssurancesDisplay("asArr");
+    private AssurancesDisplay myDisplay = new AssurancesDisplay("asArr", false);
 
-    private AssurancesDisplay toOtherDisplay = new AssurancesDisplay("otherAsArr");
+    private AssurancesDisplay toOtherDisplay = new AssurancesDisplay("otherAsArr", true);
 
     public MyPoints(String title) {
         super(title);
@@ -29,15 +28,19 @@ public class MyPoints extends Page {
         HashMap<String, Object> vars = new HashMap<String, Object>();
         vars.put("pointlist", myDisplay);
         vars.put("madelist", toOtherDisplay);
-        try {
-            User user = getUser(req);
-            vars.put("asArr", user.getReceivedAssurances());
-            vars.put("otherAsArr", user.getMadeAssurances());
-        } catch (SQLException e) {
-            new GigiApiException(e).format(resp.getWriter(), getLanguage(req));
-            return;
+        User user = getUser(req);
+        vars.put("asArr", user.getReceivedAssurances());
+        vars.put("otherAsArr", user.getMadeAssurances());
+        vars.put("assP", user.getAssurancePoints());
+        if (user.canAssure()) {
+            vars.put("expP", user.getExperiencePoints());
+            vars.put("maxP", user.getMaxAssurePoints());
         }
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }
 
+    @Override
+    public boolean isPermitted(AuthorizationContext ac) {
+        return ac != null && ac.getTarget() instanceof User;
+    }
 }