opendev/gerrit
Code Issues Proposed changes

Add server config option to disable new features

Browse Source 
Some user groups are intolerant of any sort of new feature or
funcationalty being added to the web interface.  Add a server
variable that disables or hides most new functionality.

Change-Id: Ide3a6a5e66cbba9c58575345a4a9ad1da209bb16
This commit is contained in:
Shawn Pearce
2013-12-05 17:40:28 -08:00
parent d2fc715327
commit d043611713
6 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-common/src/main/java/com/google/gerrit/common/data/GerritConfig.java
View File

@@ -53,6 +53,7 @@ public class GerritConfig implements Cloneable {
protected int changeUpdateDelay;
protected AccountGeneralPreferences.ChangeScreen changeScreen;
protected int largeChangeSize;
protected boolean newFeatures;
public String getLoginUrl() {
return loginUrl;
@@ -280,4 +281,12 @@ public class GerritConfig implements Cloneable {
public void setLargeChangeSize(int largeChangeSize) {
this.largeChangeSize = largeChangeSize;
}
public boolean getNewFeatures() {
return newFeatures;
}
public void setNewFeatures(boolean n) {
newFeatures = n;
}
}

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
View File

@@ -539,7 +539,9 @@ public class Dispatcher {
}
private static boolean isChangeScreen2() {
if (changeScreen2) {
if (!Gerrit.getConfig().getNewFeatures()) {
return false;
} else if (changeScreen2) {
return true;
}
@@ -610,7 +612,7 @@ public class Dispatcher {
top, //
baseId //
);
} else if ("cm".equals(panel)
} else if (("cm".equals(panel) && Gerrit.getConfig().getNewFeatures())
|| ("".equals(panel) && isChangeScreen2())) {
if (Gerrit.isSignedIn()
&& DiffView.UNIFIED_DIFF.equals(Gerrit.getUserAccount()

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

@@ -168,21 +168,24 @@ public class MyPreferencesScreen extends SettingsScreen {
formGrid.setWidget(row, fieldIdx, dateTimePanel);
row++;
if (Gerrit.getConfig().getNewFeatures()) {
formGrid.setText(row, labelIdx, "");
formGrid.setWidget(row, fieldIdx, relativeDateInChangeTable);
row++;
}
formGrid.setText(row, labelIdx, Util.C.commentVisibilityLabel());
formGrid.setWidget(row, fieldIdx, commentVisibilityStrategy);
row++;
if (Gerrit.getConfig().getNewFeatures()) {
formGrid.setText(row, labelIdx, Util.C.changeScreenLabel());
formGrid.setWidget(row, fieldIdx, changeScreen);
row++;
formGrid.setText(row, labelIdx, Util.C.diffViewLabel());
formGrid.setWidget(row, fieldIdx, diffView);
}
add(formGrid);
save = new Button(Util.C.buttonSaveChanges());

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java
View File

@@ -122,7 +122,8 @@ public class ChangeInfoBlock extends Composite {
}
table.setText(R_SUBMIT_TYPE, 1, submitType);
final Change.Status status = chg.getStatus();
if (status.equals(Change.Status.NEW) || status.equals(Change.Status.DRAFT)) {
if (Gerrit.getConfig().getNewFeatures()
&& (status.equals(Change.Status.NEW) || status.equals(Change.Status.DRAFT))) {
table.getRowFormatter().setVisible(R_MERGE_TEST, true);
table.setText(R_MERGE_TEST, 1, chg.isMergeable() ? Util.C
.changeInfoBlockCanMergeYes() : Util.C.changeInfoBlockCanMergeNo());

21
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java
View File

@@ -56,6 +56,7 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
private static final int C_SIZE = 8;
private static final int BASE_COLUMNS = 9;
private final boolean useNewFeatures = Gerrit.getConfig().getNewFeatures();
private final List<Section> sections;
private int columns;
private List<String> labelNames;
@@ -77,7 +78,9 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
table.setText(0, C_PROJECT, Util.C.changeTableColumnProject());
table.setText(0, C_BRANCH, Util.C.changeTableColumnBranch());
table.setText(0, C_LAST_UPDATE, Util.C.changeTableColumnLastUpdate());
if (useNewFeatures) {
table.setText(0, C_SIZE, Util.C.changeTableColumnSize());
}
final FlexCellFormatter fmt = table.getFlexCellFormatter();
fmt.addStyleName(0, C_STAR, Gerrit.RESOURCES.css().iconHeader());
@@ -141,8 +144,12 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
fmt.addStyleName(row, C_SUBJECT, Gerrit.RESOURCES.css().cSUBJECT());
fmt.addStyleName(row, C_OWNER, Gerrit.RESOURCES.css().cOWNER());
fmt.addStyleName(row, C_LAST_UPDATE, Gerrit.RESOURCES.css().cLastUpdate());
fmt.addStyleName(row, C_SIZE, Gerrit.RESOURCES.css().cSIZE());
for (int i = BASE_COLUMNS; i < columns; i++) {
int i = C_SIZE;
if (useNewFeatures) {
fmt.addStyleName(row, i++, Gerrit.RESOURCES.css().cSIZE());
}
for (; i < columns; i++) {
fmt.addStyleName(row, i, Gerrit.RESOURCES.css().cAPPROVAL());
}
}
@@ -204,7 +211,7 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
Change.Status status = c.status();
if (status != Change.Status.NEW) {
table.setText(row, C_STATUS, Util.toLongString(status));
} else if (!c.mergeable()) {
} else if (!c.mergeable() && useNewFeatures) {
table.setText(row, C_STATUS, Util.C.changeTableNotMergeable());
table.getCellFormatter().addStyleName(row, C_STATUS, Gerrit.RESOURCES.css().notMergeable());
}
@@ -226,15 +233,17 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
} else {
table.setText(row, C_LAST_UPDATE, shortFormat(c.updated()));
}
table.setText(row, C_SIZE,
int col = C_SIZE;
if (useNewFeatures) {
table.setText(row, col,
Util.M.insertionsAndDeletions(c.insertions(), c.deletions()));
}
boolean displayName = Gerrit.isSignedIn() && Gerrit.getUserAccount()
.getGeneralPreferences().isShowUsernameInReviewCategory();
for (int idx = 0; idx < labelNames.size(); idx++) {
for (int idx = 0; idx < labelNames.size(); idx++, col++) {
String name = labelNames.get(idx);
int col = BASE_COLUMNS + idx;
LabelInfo label = c.label(name);
if (label == null) {

1
gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritConfigProvider.java
View File

@@ -127,6 +127,7 @@ class GerritConfigProvider implements Provider<GerritConfig> {
"gerrit", null, "changeScreen",
AccountGeneralPreferences.ChangeScreen.CHANGE_SCREEN2));
config.setLargeChangeSize(cfg.getInt("change", "largeChange", 500));
config.setNewFeatures(cfg.getBoolean("gerrit", "enableNewFeatures", true));
config.setReportBugUrl(cfg.getString("gerrit", null, "reportBugUrl"));
if (config.getReportBugUrl() == null) {