Simplify permission checks

guillep2k · Nov 9, 2019 · 72d0f5f · 72d0f5f
1 parent fd27108
commit 72d0f5f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/models/action.go b/models/action.go
@@ -490,8 +490,8 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit, bra
 			refMarked[key] = true
 
 			// FIXME: this kind of condition is all over the code, it should be consolidated in a single place
-			canclose := perm.IsAdmin() || perm.IsOwner() || perm.CanWrite(UnitTypeIssues) || refIssue.PosterID == doer.ID
-			cancomment := canclose || perm.CanRead(UnitTypeIssues)
+			canclose := perm.CanWrite(UnitTypeIssues) || refIssue.PosterID == doer.ID
+			cancomment := perm.CanRead(UnitTypeIssues)
 
 			// Don't proceed if the user can't comment
 			if !cancomment {