Leave assignee feature always enabled
The assignee feature cannot be disabled and thus does not make
so much sense to just show and hide some parts of it here and there
on the Gerrit UX.
Leave only the possibility to enable/disable the display of
the assignee field as column in the changes table.
Change-Id: Icbfb93a49f29b2fde60b92b448862216861108d1
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index bc1c151..72b5595 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1022,25 +1022,13 @@
+
Default is true.
-[[change.showAssignee]]change.showAssignee::
+[[change.showAssigneeInChangesTable]]change.showAssigneeInChangesTable::
+
Show assignee field in changes table. If set to false, assignees will
not be visible in changes table.
+
Default is false.
-[[change.showAssigneeSuggestOracle]]change.showAssigneeSuggestOracle::
-+
-Allow assignee to be search-able through the changes search box.
-If set to false, assignees search predicates will not be suggested
-in the changes search box.
-+
-NOTE: When both showAssignee and showAssigneeSuggestOracle are both
-set to false, the assignee field would not be shown anywhere in Gerrit,
-disabling the access to the feature.
-+
-Default is true.
-
[[change.submitLabel]]change.submitLabel::
+
Label name for the submit button.
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeConfigInfo.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeConfigInfo.java
index 10d956b..b710121 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeConfigInfo.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/common/ChangeConfigInfo.java
@@ -16,8 +16,7 @@
public class ChangeConfigInfo {
public Boolean allowBlame;
- public Boolean showAssignee;
- public Boolean showAssigneeSuggestOracle;
+ public Boolean showAssigneeInChangesTable;
public Boolean allowDrafts;
public int largeChange;
public String replyLabel;
diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ServerInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ServerInfo.java
index 29b7cb4..0a37307 100644
--- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ServerInfo.java
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ServerInfo.java
@@ -70,10 +70,7 @@
public final native String replyTooltip() /*-{ return this.reply_tooltip; }-*/;
- public final native boolean showAssignee() /*-{ return this.show_assignee || false; }-*/;
-
- public final native boolean
- showAssigneeSuggestOracle() /*-{ return this.show_assignee_suggest_oracle || false; }-*/;
+ public final native boolean showAssigneeInChangesTable() /*-{ return this.show_assignee_in_changes_table || false; }-*/;
public final native int updateDelay() /*-{ return this.update_delay || 0; }-*/;
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java
index 7c8de00..9f87672 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/SearchSuggestOracle.java
@@ -157,11 +157,9 @@
suggestions.add("hashtag:");
}
- if (Gerrit.info().change().showAssigneeSuggestOracle()) {
- suggestions.add("is:assigned");
- suggestions.add("is:unassigned");
- suggestions.add("assignee:");
- }
+ suggestions.add("is:assigned");
+ suggestions.add("is:unassigned");
+ suggestions.add("assignee:");
suggestions.add("AND");
suggestions.add("OR");
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
index c597230..2edc137 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
@@ -156,7 +156,6 @@
dateTimePanel.add(timeFormat);
}
highlightAssigneeInChangeTable = new CheckBox(Util.C.highlightAssigneeInChangeTable());
- highlightAssigneeInChangeTable.setEnabled(Gerrit.info().change().showAssignee());
relativeDateInChangeTable = new CheckBox(Util.C.showRelativeDateInChangeTable());
sizeBarInChangeTable = new CheckBox(Util.C.showSizeBarInChangeTable());
legacycidInChangeTable = new CheckBox(Util.C.showLegacycidInChangeTable());
@@ -290,7 +289,7 @@
maximumPageSize.setEnabled(on);
dateFormat.setEnabled(on);
timeFormat.setEnabled(on);
- highlightAssigneeInChangeTable.setEnabled(Gerrit.info().change().showAssignee());
+ highlightAssigneeInChangeTable.setEnabled(on);
relativeDateInChangeTable.setEnabled(on);
sizeBarInChangeTable.setEnabled(on);
legacycidInChangeTable.setEnabled(on);
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
index eb54bd9..e91b6f3 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
@@ -1324,12 +1324,7 @@
commit.set(commentLinkProcessor, info, revision);
related.set(info, revision);
reviewers.set(info);
- if (Gerrit.info().change().showAssignee()
- || Gerrit.info().change().showAssigneeSuggestOracle()) {
- assignee.set(info);
- } else {
- setVisible(assigneeRow, false);
- }
+ assignee.set(info);
if (Gerrit.isNoteDbEnabled()) {
hashtags.set(info, revision);
} else {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
index ab41ad6..adf7cff 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
@@ -80,7 +80,7 @@
super(Util.C.changeItemHelp());
columns = BASE_COLUMNS;
labelNames = Collections.emptyList();
- showAssignee = Gerrit.info().change().showAssignee();
+ showAssignee = Gerrit.info().change().showAssigneeInChangesTable();
showLegacyId = Gerrit.getUserPreferences().legacycidInChangeTable();
if (Gerrit.isSignedIn()) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
index bb17697..3907c98 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
@@ -206,11 +206,8 @@
info.allowDrafts = toBoolean(cfg.getBoolean("change", "allowDrafts", true));
boolean hasAssigneeInIndex =
indexes.getSearchIndex().getSchema().hasField(ChangeField.ASSIGNEE);
- info.showAssignee =
- toBoolean(cfg.getBoolean("change", "showAssignee", false) && hasAssigneeInIndex);
- info.showAssigneeSuggestOracle =
- toBoolean(
- cfg.getBoolean("change", "showAssigneeSuggestOracle", true) && hasAssigneeInIndex);
+ info.showAssigneeInChangesTable =
+ toBoolean(cfg.getBoolean("change", "showAssigneeInChangesTable", false) && hasAssigneeInIndex);
info.largeChange = cfg.getInt("change", "largeChange", 500);
info.replyTooltip =
Optional.ofNullable(cfg.getString("change", null, "replyTooltip")).orElse("Reply and score")
