fixup! UPD: Use new template features in mailmanagement

diff --git a/src/org/cacert/gigi/pages/account/MailManagementForm.java b/src/org/cacert/gigi/pages/account/MailManagementForm.java
index 354f6d33a1ef6118ed673b6600fed9dc442aedbb..41900314659b9ff0eeeacd6b2ac6d5468b4e7903 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/MailManagementForm.java
@@ -64,7 +64,7 @@ public class MailManagementForm extends Form {
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
-        final EmailAddress[] emails = (EmailAddress[]) vars.get("mils");
+        final EmailAddress[] emails = target.getEmails();
         IterableDataset ds = new IterableDataset() {
 
             private int point = 0;

diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java
index 81c5b9cb80815452a2a0d158bd2961bda9b138fe..298c132b29404f2235cef80b4d3a8b6a37641a4c 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/MailOverview.java
@@ -27,7 +27,6 @@ public class MailOverview extends Page {
         HashMap<String, Object> vars = new HashMap<>();
         vars.put("addForm", new MailAddForm(req, us));
         vars.put("manForm", new MailManagementForm(req, us));
-        vars.put("mils", us.getEmails());
         getDefaultTemplate().output(resp.getWriter(), lang, vars);
     }