upd: replace preferred name by user id in points issued table

[gigi.git] / src / org / cacert / gigi / output / AssurancesDisplay.java

diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.java b/src/org/cacert/gigi/output/AssurancesDisplay.java
index 639197cd279024ec417da073a5c3362cc07aad86..595872ac3ac778f98c8760beac6887a14b5c62b7 100644 (file)
--- a/src/org/cacert/gigi/output/AssurancesDisplay.java
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.java
@@ -11,16 +11,12 @@ import org.cacert.gigi.output.template.Template;
 
 public class AssurancesDisplay implements Outputable {
 
-    private static Template template;
+    private static final Template template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ"));
 
     private boolean assurer;
 
     public String assuranceArray;
 
-    static {
-        template = new Template(AssurancesDisplay.class.getResource("AssurancesDisplay.templ"));
-    }
-
     public AssurancesDisplay(String assuranceArray, boolean assurer) {
         this.assuranceArray = assuranceArray;
         this.assurer = assurer;
@@ -30,9 +26,10 @@ public class AssurancesDisplay implements Outputable {
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         final Assurance[] assurances = (Assurance[]) vars.get(assuranceArray);
         if (assurer) {
-            vars.put("verb", l.getTranslation("To"));
+            vars.put("verb", l.getTranslation("To (User Id)"));
         } else {
             vars.put("verb", l.getTranslation("From"));
+            vars.put("myName", "yes");
         }
 
         IterableDataset assuranceGroup = new IterableDataset() {
@@ -48,9 +45,11 @@ public class AssurancesDisplay implements Outputable {
                     vars.put("id", assurance.getId());
                     vars.put("method", assurance.getMethod());
                     if (assurer) {
-                        vars.put("verbVal", assurance.getTo().getName());
+                        vars.put("verbVal", assurance.getTo().getOwner().getId());
+                        vars.put("myName", assurance.getTo());
                     } else {
-                        vars.put("verbVal", assurance.getFrom().getName());
+                        vars.put("verbVal", assurance.getFrom().getPreferredName());
+                        vars.put("myName", assurance.getTo());
                     }
                     vars.put("date", assurance.getDate());
                     vars.put("location", assurance.getLocation());