opendev/gerrit
Code Issues Proposed changes

Account.FieldName: Move to extension API as AccountFieldName

Browse Source 
Change-Id: I103dbe8bfaeb2acc67c6afd505c693953860bb0c
This commit is contained in:
David Pursehouse
2016-08-22 20:50:51 +09:00
parent 77a4c6a522
commit 117b0e802b
19 changed files with 76 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,7 @@ import com.google.gerrit.client.rpc.Natives;
import com.google.gerrit.client.ui.OnEditEnabler;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.common.errors.EmailException;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Account.FieldName;
import com.google.gerrit.extensions.client.AccountFieldName;
import com.google.gwt.core.client.JsArray;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
@@ -102,7 +101,7 @@ class ContactPanelShort extends Composite {
}
int row = 0;
if (!Gerrit.info().auth().canEdit(FieldName.USER_NAME)
if (!Gerrit.info().auth().canEdit(AccountFieldName.USER_NAME)
&& Gerrit.info().auth().siteHasUsernames()) {
infoPlainText.resizeRows(infoPlainText.getRowCount() + 1);
row(infoPlainText, row++, Util.C.userName(), new UsernameField());
@@ -171,11 +170,11 @@ class ContactPanelShort extends Composite {
}
private boolean canEditFullName() {
return Gerrit.info().auth().canEdit(Account.FieldName.FULL_NAME);
return Gerrit.info().auth().canEdit(AccountFieldName.FULL_NAME);
}
private boolean canRegisterNewEmail() {
return Gerrit.info().auth().canEdit(Account.FieldName.REGISTER_NEW_EMAIL);
return Gerrit.info().auth().canEdit(AccountFieldName.REGISTER_NEW_EMAIL);
}
void hideSaveButton() {

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/RegisterScreen.java
View File

@@ -20,7 +20,7 @@ import com.google.gerrit.client.ui.AccountScreen;
import com.google.gerrit.client.ui.InlineHyperlink;
import com.google.gerrit.client.ui.SmallHeading;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.reviewdb.client.Account.FieldName;
import com.google.gerrit.extensions.client.AccountFieldName;
import com.google.gwt.i18n.client.LocaleInfo;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.FormPanel;
@@ -70,7 +70,7 @@ public class RegisterScreen extends AccountScreen {
formBody.add(contactGroup);
if (Gerrit.getUserAccount().username() == null
&& Gerrit.info().auth().canEdit(FieldName.USER_NAME)) {
&& Gerrit.info().auth().canEdit(AccountFieldName.USER_NAME)) {
final FlowPanel fp = new FlowPanel();
fp.setStyleName(Gerrit.RESOURCES.css().registerScreenSection());
fp.add(new SmallHeading(Util.C.welcomeUsernameHeading()));

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java
View File

@@ -22,6 +22,7 @@ import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.client.rpc.NativeString;
import com.google.gerrit.client.rpc.RestApi;
import com.google.gerrit.client.ui.OnEditEnabler;
import com.google.gerrit.extensions.client.AccountFieldName;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -86,7 +87,7 @@ class UsernameField extends Composite {
}
private boolean canEditUserName() {
return Gerrit.info().auth().canEdit(Account.FieldName.USER_NAME);
return Gerrit.info().auth().canEdit(AccountFieldName.USER_NAME);
}
private void confirmSetUserName() {