upd: Disable "Set as default" button for non-verified email adresses.

Change-Id: Ia1072668797dded71a9208b34fa13cc457839530

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
index 9be2bf528132044ed4132b331a39631b5fa3a554..04ed69d2258d808736936b5db29dc225662f74e0 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
@@ -74,12 +74,17 @@ public class MailManagementForm extends Form {
                 vars.put("id", mailID);
                 if (emailAddress.getAddress().equals(target.getEmail())) {
                     vars.put("default", " disabled");
                 vars.put("id", mailID);
                 if (emailAddress.getAddress().equals(target.getEmail())) {
                     vars.put("default", " disabled");

+                    vars.put("deletable", " disabled");

                 } else {
                 } else {

+                    vars.put("deletable", "");

                     vars.put("default", "");
                 }
                 if (emailAddress.isVerified()) {
                     vars.put("verification", l.getTranslation("Verified"));
                 } else {
                     vars.put("default", "");
                 }
                 if (emailAddress.isVerified()) {
                     vars.put("verification", l.getTranslation("Verified"));
                 } else {

+                    // only verified emails may become the default email
+                    // address.
+                    vars.put("default", " disabled");

                     vars.put("verification", l.getTranslation("Unverified"));
                 }
                 vars.put("last_verification", emailAddress.getLastPing(true));
                     vars.put("verification", l.getTranslation("Unverified"));
                 }
                 vars.put("last_verification", emailAddress.getLastPing(true));

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
index 404048993fb0f46d2bd4936794cb80c80c24f2b2..e942560b1bf4bd010cfcd214d1a077b9e57684a6 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
@@ -19,7 +19,7 @@
                <td><?=$verification?></td>
                <td><?=$last_verification?></td>
                <td><?=$address?></td>
                <td><?=$verification?></td>
                <td><?=$last_verification?></td>
                <td><?=$address?></td>

-               <td><input class="form-control" type="submit" name="delete:<?=$id?>" value="<?=_Delete?>"<?=$default?>></td>
+               <td><input class="form-control" type="submit" name="delete:<?=$id?>" value="<?=_Delete?>"<?=$deletable?>></td>

                <td><input class="form-control" type="submit" name="reping:<?=$id?>" value="<?=_Request reping?>"></td>
        </tr>
  <? } ?>
                <td><input class="form-control" type="submit" name="reping:<?=$id?>" value="<?=_Request reping?>"></td>
        </tr>
  <? } ?>