From 359bb96e4a71cef3a1f73737362a79c1337bb292 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 1 Dec 2021 11:37:01 +0800 Subject: [PATCH 1/2] #882 remove watcher from reviewers --- models/repo.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/models/repo.go b/models/repo.go index 1a5cf122c..05207fed1 100755 --- a/models/repo.go +++ b/models/repo.go @@ -667,15 +667,11 @@ func (repo *Repository) getReviewersPublic(e Engine, doerID, posterID int64) (_ users := make([]*User, 0) const SQLCmd = "SELECT * FROM `user` WHERE id IN ( " + - "SELECT user_id FROM `access` WHERE repo_id = ? AND mode >= ? AND user_id NOT IN ( ?, ?) " + - "UNION " + - "SELECT user_id FROM `watch` WHERE repo_id = ? AND user_id NOT IN ( ?, ?) AND mode IN (?, ?) " + - ") ORDER BY name" + "SELECT user_id FROM `access` WHERE repo_id = ? AND mode >= ? AND user_id NOT IN ( ?, ?) ) ORDER BY name " if err = e. SQL(SQLCmd, - repo.ID, AccessModeRead, doerID, posterID, - repo.ID, doerID, posterID, RepoWatchModeNormal, RepoWatchModeAuto). + repo.ID, AccessModeRead, doerID, posterID). Find(&users); err != nil { return nil, err } From 421828c75884bf0883f9544c0fe9af05d1f703ec Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 1 Dec 2021 16:36:06 +0800 Subject: [PATCH 2/2] change review request access from AccessModeRead to AccessModeWrite --- routers/repo/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 555cd065f..9483814d6 100755 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1390,7 +1390,7 @@ func isLegalReviewRequest(reviewer, doer *models.User, isAdd bool, issue *models var pemResult bool if isAdd { - pemResult = permReviewer.CanAccessAny(models.AccessModeRead, models.UnitTypePullRequests) + pemResult = permReviewer.CanAccessAny(models.AccessModeWrite, models.UnitTypePullRequests) if !pemResult { return fmt.Errorf("Reviewer can't read [user_id: %d, repo_name: %s]", reviewer.ID, issue.Repo.Name) }