upd: move my Listing to WOT pages ( + testCase)

[gigi.git] / src / org / cacert / gigi / pages / wot / MyListingForm.java

diff --git a/src/org/cacert/gigi/pages/account/MyListingForm.java b/src/org/cacert/gigi/pages/wot/MyListingForm.java
similarity index 76%
rename from src/org/cacert/gigi/pages/account/MyListingForm.java
rename to src/org/cacert/gigi/pages/wot/MyListingForm.java
index b3e831827c870f3077886684437aca03154983f6..97218a5c55738bb1921d4155275ef184bb1a62d5 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyListingForm.java
+++ b/src/org/cacert/gigi/pages/wot/MyListingForm.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi.pages.account;
+package org.cacert.gigi.pages.wot;
 
 import java.io.PrintWriter;
 import java.util.Map;
@@ -28,8 +28,13 @@ public class MyListingForm extends Form {
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) {
         if (req.getParameter("listme") != null && req.getParameter("contactinfo") != null) {
-            target.setDirectoryListing( !req.getParameter("listme").equals("0"));
-            target.setContactInformation(req.getParameter("contactinfo"));
+            boolean on = !req.getParameter("listme").equals("0");
+            target.setDirectoryListing(on);
+            if (on) {
+                target.setContactInformation(req.getParameter("contactinfo"));
+            } else {
+                target.setContactInformation("");
+            }
             return true;
         }
         return false;
@@ -44,7 +49,7 @@ public class MyListingForm extends Form {
         } else {
             vars.put("selected", "");
             vars.put("notSelected", "selected");
-            vars.put("activeInfo", "");
+            vars.put("activeInfo", target.getContactInformation());
         }
         template.output(out, l, vars);
     }