Merge "Suggest values for query shorthands o, r and p"
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java
index 2956ffc..391cfbf 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java
@@ -111,8 +111,10 @@
UIObject.setVisible(error, false);
editAssigneeIcon.setVisible(false);
suggestBox.setFocus(true);
- suggestBox.setText(FormatUtil.nameEmail(currentAssignee));
- suggestBox.selectAll();
+ if (currentAssignee != null) {
+ suggestBox.setText(FormatUtil.nameEmail(currentAssignee));
+ suggestBox.selectAll();
+ }
}
void onCloseForm() {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/AssigneeSuggestOracle.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/AssigneeSuggestOracle.java
index 8dc5574..e505ad2 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/AssigneeSuggestOracle.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/AssigneeSuggestOracle.java
@@ -38,22 +38,22 @@
@Override
protected void _onRequestSuggestions(Request req, Callback cb) {
ChangeApi
- .suggestReviewers(changeId.get(), req.getQuery(), req.getLimit(), true)
- .get(new GerritCallback<JsArray<SuggestReviewerInfo>>() {
- @Override
- public void onSuccess(JsArray<SuggestReviewerInfo> result) {
- List<RestReviewerSuggestion> r = new ArrayList<>(result.length());
- for (SuggestReviewerInfo reviewer : Natives.asList(result)) {
- r.add(new RestReviewerSuggestion(reviewer, req.getQuery()));
- }
- cb.onSuggestionsReady(req, new Response(r));
- }
+ .suggestReviewers(changeId.get(), req.getQuery(), req.getLimit(), true)
+ .get(new GerritCallback<JsArray<SuggestReviewerInfo>>() {
+ @Override
+ public void onSuccess(JsArray<SuggestReviewerInfo> result) {
+ List<RestReviewerSuggestion> r = new ArrayList<>(result.length());
+ for (SuggestReviewerInfo reviewer : Natives.asList(result)) {
+ r.add(new RestReviewerSuggestion(reviewer, req.getQuery()));
+ }
+ cb.onSuggestionsReady(req, new Response(r));
+ }
- @Override
- public void onFailure(Throwable err) {
- List<Suggestion> r = Collections.emptyList();
- cb.onSuggestionsReady(req, new Response(r));
- }
- });
+ @Override
+ public void onFailure(Throwable err) {
+ List<Suggestion> r = Collections.emptyList();
+ cb.onSuggestionsReady(req, new Response(r));
+ }
+ });
}
}
