UPD: allow deleting of all names except first name.

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 4f85ab687f32f4809e000c080ea3c244825d9078..74e454542dc8f6e6c4bdf159ce30a06ee12a759e 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -42,7 +42,7 @@ public class MyDetailsForm extends Form {
                 String newLname = req.getParameter("lname").trim();
                 String newMname = req.getParameter("mname").trim();
                 String newSuffix = req.getParameter("suffix").trim();
                 String newLname = req.getParameter("lname").trim();
                 String newMname = req.getParameter("mname").trim();
                 String newSuffix = req.getParameter("suffix").trim();

-                if ((newFname.isEmpty() && !target.getFname().isEmpty()) || (newLname.isEmpty() && !target.getLname().isEmpty()) || (newMname.isEmpty() && !target.getMname().isEmpty()) || (newSuffix.isEmpty() && !target.getSuffix().isEmpty())) {
+                if (newFname.isEmpty() && !target.getFname().isEmpty()) {

                     throw new GigiApiException("Names couldn't be removed.");
                 }
                 target.setFname(newFname);
                     throw new GigiApiException("Names couldn't be removed.");
                 }
                 target.setFname(newFname);

diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
index af6cecb34c292597d2db2922910caef4df58bdb8..d2cd561b0a9918d4865f7fb96cda2cc2a5b7e9a9 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
+++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
@@ -59,9 +59,10 @@ public class TestMyDetailsEdit extends ManagedTest {
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=" + newName + "&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
         assertEquals(newName, u.getSuffix());
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=" + newName + "&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
         assertEquals(newName, u.getSuffix());

-        assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        clearCaches();

         u = User.getById(id);
         u = User.getById(id);

-        assertEquals(newName, u.getSuffix());
+        assertEquals("", u.getSuffix());

     }
 
     @Test
     }
 
     @Test


@@ -74,9 +75,9 @@ public class TestMyDetailsEdit extends ManagedTest {
 
     @Test
     public void testUnsetLname() throws IOException {
 
     @Test
     public void testUnsetLname() throws IOException {

-        assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));

         User u = User.getById(id);
         User u = User.getById(id);

-        assertEquals("Hansel", u.getLname());
+        assertEquals("", u.getLname());

     }
 
     @Test
     }
 
     @Test


@@ -85,9 +86,10 @@ public class TestMyDetailsEdit extends ManagedTest {
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=" + newName + "&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
         assertEquals(newName, u.getMname());
         assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "mname=" + newName + "&fname=Kurti&lname=Hansel&suffix=&day=1&month=1&year=2000&processDetails", 0));
         User u = User.getById(id);
         assertEquals(newName, u.getMname());

-        assertNotNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        clearCaches();

         u = User.getById(id);
         u = User.getById(id);

-        assertEquals(newName, u.getMname());
+        assertEquals("", u.getMname());

 
     }
 
 
     }