opendev/gerrit
Code Issues Proposed changes

ContactPanelShort: Use REST API to get account name and preferred email

Browse Source 
Change-Id: I616596898d2174e15a41c79e373625adae22754f
This commit is contained in:
David Pursehouse 2016-02-18 20:13:28 +09:00
parent 7e27b6e12f
commit 941dd462f0
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountApi.java
View File

@ -76,6 +76,11 @@ public class AccountApi {
new RestApi("/accounts/").id(account).view("username").put(input, cb);
}
/** Retrieve the account name */
public static void getName(String account, AsyncCallback<NativeString> cb) {
new RestApi("/accounts/").id(account).view("name").get(cb);
}
/** Retrieve email addresses */
public static void getEmails(String account,
AsyncCallback<JsArray<EmailInfo>> cb) {

33
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/ContactPanelShort.java
View File

@ -18,7 +18,9 @@ import com.google.gerrit.client.ErrorDialog;
import com.google.gerrit.client.FormatUtil;
import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.info.AccountInfo;
import com.google.gerrit.client.rpc.CallbackGroup;
import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.client.rpc.NativeString;
import com.google.gerrit.client.rpc.Natives;
import com.google.gerrit.client.ui.OnEditEnabler;
import com.google.gerrit.common.PageLinks;
@ -194,36 +196,41 @@ class ContactPanelShort extends Composite {
haveAccount = false;
haveEmails = false;
Util.ACCOUNT_SVC.myAccount(new GerritCallback<Account>() {
CallbackGroup group = new CallbackGroup();
AccountApi.getName("self", group.add(new GerritCallback<NativeString>() {
@Override
public void onSuccess(Account result) {
if (!isAttached()) {
return;
}
display(FormatUtil.asInfo(result));
public void onSuccess(NativeString result) {
nameTxt.setText(result.asString());
haveAccount = true;
postLoad();
}
});
AccountApi.getEmails("self", new GerritCallback<JsArray<EmailInfo>>() {
@Override
public void onFailure(Throwable caught) {
}
}));
AccountApi.getEmails("self", group.addFinal(new GerritCallback<JsArray<EmailInfo>>() {
@Override
public void onSuccess(JsArray<EmailInfo> result) {
if (!isAttached()) {
return;
}
for (EmailInfo i : Natives.asList(result)) {
emailPick.addItem(i.email());
if (i.isPreferred()) {
currentEmail = i.email();
}
}
haveEmails = true;
postLoad();
}
});
}));
}
private void postLoad() {
if (haveAccount && haveEmails) {
updateEmailList();
registerNewEmail.setEnabled(true);
save.setEnabled(false);
new OnEditEnabler(save, nameTxt);
}
display();
}