X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FAssurePage.java;h=e1822e3beb1dc91cd817fb6de78e7ad710c9562b;hb=b1092da65fd373d945343e01dd8975ec3b84db0a;hp=3aa413503f68571ee714844e04834611a800742a;hpb=6b2e44980e51485db1a4e1e62b3db0d00d2bec10;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index 3aa41350..e1822e3b 100644
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -10,15 +10,15 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.Notary;
-import org.cacert.gigi.util.Notary.AssuranceResult;
 
 public class AssurePage extends Page {
 
@@ -56,10 +56,10 @@ public class AssurePage extends Page {
 
     private void outputForm(HttpServletRequest req, PrintWriter out, AssuranceForm form) {
         User myself = LoginPage.getUser(req);
-        AssuranceResult check = Notary.checkAssuranceIsPossible(myself, form.getAssuree());
-        if (check != AssuranceResult.ASSURANCE_SUCCEDED) {
-            out.println(translate(req, check.getMessage()));
-            return;
+        try {
+            Notary.checkAssuranceIsPossible(myself, form.getAssuree());
+        } catch (GigiApiException e) {
+            e.format(out, Page.getLanguage(req));
         }
 
         form.output(out, getLanguage(req), new HashMap<String, Object>());
@@ -98,7 +98,7 @@ public class AssurePage extends Page {
                     } else if (getUser(req).getId() == id) {
 
                     } else {
-                        AssuranceForm form = new AssuranceForm(req, id);
+                        AssuranceForm form = new AssuranceForm(req, User.getById(id));
                         outputForm(req, out, form);
                     }
                 }