From: Felix Dörre <felix@dogcraft.de>
Date: Fri, 17 Jun 2016 15:29:48 +0000 (+0200)
Subject: upd: Disable "Set as default" button for non-verified email adresses.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=f2a841243b6b4f51ae3adb1bdd2ffe0d39e4893e

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 9be2bf52..04ed69d2 100644
--- 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("deletable", " disabled");
                 } else {
+                    vars.put("deletable", "");
                     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));
diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
index 40404899..e942560b 100644
--- 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><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>
  <? } ?>