Merge "Show preferred email as empty if user has no preferred email address"

2013-05-28 23:14:36 +00:00
parent a9bcc5f7bd 2854add3cb
commit cc40679510
1 changed files with 8 additions and 0 deletions
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
@@ -423,6 +423,14 @@ class ContactPanelShort extends Composite {
      }
    }
    if (emailPick.getItemCount() > 0) {
+      if (currentEmail == null) {
+        int index = emailListIndexOf("");
+        if (index != -1) {
+          emailPick.removeItem(index);
+        }
+        emailPick.insertItem("", 0);
+        emailPick.setSelectedIndex(0);
+      }
      emailPick.setVisible(true);
      emailPick.setEnabled(true);
      if (canRegisterNewEmail()) {