opendev/gerrit
Code Issues Proposed changes

Limit assignee suggestions to users that can see the change

Browse Source 
Bug: Issue 5181
Change-Id: Ib64248a285e8feca1fd8f18e825f302d09d252ed
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-12-30 09:49:52 +01:00
committed by David Pursehouse
parent 1815347a33
commit 08606b49a2
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArray;
import com.google.gwt.core.client.JsArrayString;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwtorm.client.KeyUtil;
import java.util.HashSet;
import java.util.Set;
@@ -49,7 +50,7 @@ public class AccountApi {
public static void suggest(String query, int limit, AsyncCallback<JsArray<AccountInfo>> cb) {
new RestApi("/accounts/")
.addParameterTrue("suggest")
.addParameter("q", query)
.addParameterRaw("q", KeyUtil.encode(query))
.addParameter("n", limit)
.background()
.get(cb);

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Assignee.java
View File

@@ -102,6 +102,7 @@ public class Assignee extends Composite {
this.changeId = info.legacyId();
this.project = info.projectNameKey();
this.canEdit = info.hasActions() && info.actions().containsKey("assignee");
assigneeSuggestOracle.setChange(info);
setAssignee(info.assignee());
editAssigneeIcon.setVisible(canEdit);
if (!canEdit) {

19
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/AssigneeSuggestOracle.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.client.change;
import com.google.gerrit.client.account.AccountApi;
import com.google.gerrit.client.info.AccountInfo;
import com.google.gerrit.client.info.ChangeInfo;
import com.google.gerrit.client.rpc.GerritCallback;
import com.google.gerrit.client.rpc.Natives;
import com.google.gerrit.client.ui.AccountSuggestOracle.AccountSuggestion;
@@ -27,10 +28,17 @@ import java.util.List;
/** REST API based suggestion Oracle for assignee */
public class AssigneeSuggestOracle extends SuggestAfterTypingNCharsOracle {
private ChangeInfo change;
public void setChange(ChangeInfo change) {
this.change = change;
}
@Override
protected void _onRequestSuggestions(Request req, Callback cb) {
AccountApi.suggest(
req.getQuery(),
getQuery(req),
req.getLimit(),
new GerritCallback<JsArray<AccountInfo>>() {
@Override
@@ -49,4 +57,13 @@ public class AssigneeSuggestOracle extends SuggestAfterTypingNCharsOracle {
}
});
}
private String getQuery(Request req) {
StringBuilder query = new StringBuilder();
query.append(req.getQuery());
if (change != null) {
query.append(" cansee:").append(change._number());
}
return query.toString();
}
}