upd: refactor FindUserByEmail to have two separate templates

Change-Id: I20f80a92be83a9bd84d0a925d77761269d36c0e4

diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
index 8563721efc817f2f9dc1c809973dfed08b4bbd77..90a627e33bf9f060d54fc621f84144c16e399768 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
@@ -1,14 +1,3 @@
-<? if($usertable) {?>
-<p>Multiple users where found.</p>
-<table class="table">
-<tr>
-<th>Id</th><th>E-Mail</th></tr>
-<? foreach($usertable) {?>
-       <tr><td><a href="/support/user/<?=$usrid?>/"><?=$usrid?></a></td><td><a href="/support/user/<?=$usrid?>/"><?=$usermail?></a></td></tr>
-<? } ?>
-</table>
-<? } ?>
-<? if($first) {?>
 <table class="table">
   <tbody><tr>
     <th colspan="2"><?=_Find User by Email?></th>
@@ -21,4 +10,3 @@
     <td colspan="2"><input name="process" value="<?=_Next?>" type="submit"/></td>
   </tr>
 </tbody></table>
-<? } ?>

diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java
index 85e69a33fb6fa87697114c27d1dcb71e7428ab88..ace7888a01dd91888b2e28182dc3b4795e31f3c0 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java
@@ -12,6 +12,7 @@ import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.IterableDataset;
+import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.AuthorizationContext;
 
@@ -19,15 +20,15 @@ public class FindUserByEmailPage extends Page {
 
     public static final String PATH = "/support/find/email";
 
+    private static final Template USERTABLE = new Template(FindUserByDomainPage.class.getResource("FindUserByEmailUsertable.templ"));
+
     public FindUserByEmailPage() {
         super("Find Email");
     }
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        HashMap<String, Object> vars = new HashMap<String, Object>();
-        vars.put("first", true);
-        new FindUserByEmailForm(req).output(resp.getWriter(), Page.getLanguage(req), vars);
+        new FindUserByEmailForm(req).output(resp.getWriter(), Page.getLanguage(req), new HashMap<String, Object>());
     }
 
     @Override
@@ -40,7 +41,6 @@ public class FindUserByEmailPage extends Page {
                 resp.sendRedirect(SupportUserDetailsPage.PATH + emails[0].getOwner().getId() + "/");
             } else {
                 HashMap<String, Object> vars = new HashMap<String, Object>();
-                vars.put("first", false);
                 vars.put("usertable", new IterableDataset() {
 
                     int i = 0;
@@ -56,11 +56,11 @@ public class FindUserByEmailPage extends Page {
                         return true;
                     }
                 });
-                form.output(resp.getWriter(), getLanguage(req), vars);
+                USERTABLE.output(resp.getWriter(), getLanguage(req), vars);
             }
         } catch (GigiApiException e) {
             e.format(resp.getWriter(), Page.getLanguage(req));
-            doGet(req, resp);
+            form.output(resp.getWriter(), Page.getLanguage(req), new HashMap<String, Object>());
         }
     }
 

diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailUsertable.templ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailUsertable.templ
new file mode 100644 (file)
index 0000000..0104a91
--- /dev/null
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailUsertable.templ
@@ -0,0 +1,8 @@
+<p>Multiple users where found.</p>
+<table class="table">
+<tr>
+<th>Id</th><th>E-Mail</th></tr>
+<? foreach($usertable) {?>
+       <tr><td><a href="/support/user/<?=$usrid?>/"><?=$usrid?></a></td><td><a href="/support/user/<?=$usrid?>/"><?=$usermail?></a></td></tr>
+<? } ?>
+</table>