@@ -1196,16 +1196,17 @@ func registerRoutes(m *web.Router) {
1196
1196
})
1197
1197
})
1198
1198
}
1199
+ // FIXME: many "pulls" requests are sent to "issues" endpoints correctly, so the issue endpoints have to tolerate pull request permissions at the moment
1200
+ m .Group ("/{username}/{reponame}/{type:issues}" , addIssuesPullsViewRoutes , optSignIn , context .RepoAssignment , context .RequireUnitReader (unit .TypeIssues , unit .TypePullRequests ))
1201
+ m .Group ("/{username}/{reponame}/{type:pulls}" , addIssuesPullsViewRoutes , optSignIn , context .RepoAssignment , reqUnitPullsReader )
1202
+
1199
1203
m .Group ("/{username}/{reponame}" , func () {
1200
1204
m .Get ("/comments/{id}/attachments" , repo .GetCommentAttachments )
1201
1205
m .Get ("/labels" , repo .RetrieveLabelsForList , repo .Labels )
1202
1206
m .Get ("/milestones" , repo .Milestones )
1203
1207
m .Get ("/milestone/{id}" , context .RepoRef (), repo .MilestoneIssuesAndPulls )
1204
1208
m .Get ("/issues/suggestions" , repo .IssueSuggestions )
1205
1209
}, optSignIn , context .RepoAssignment , reqRepoIssuesOrPullsReader ) // issue/pull attachments, labels, milestones
1206
-
1207
- m .Group ("/{username}/{reponame}/{type:issues}" , addIssuesPullsViewRoutes , optSignIn , context .RepoAssignment , reqUnitIssuesReader )
1208
- m .Group ("/{username}/{reponame}/{type:pulls}" , addIssuesPullsViewRoutes , optSignIn , context .RepoAssignment , reqUnitPullsReader )
1209
1210
// end "/{username}/{reponame}": view milestone, label, issue, pull, etc
1210
1211
1211
1212
m .Group ("/{username}/{reponame}/{type:issues}" , func () {
@@ -1224,7 +1225,7 @@ func registerRoutes(m *web.Router) {
1224
1225
m .Get ("/search" , repo .SearchRepoIssuesJSON )
1225
1226
}, reqUnitIssuesReader )
1226
1227
1227
- addIssuesPullsRoutes := func () {
1228
+ addIssuesPullsUpdateRoutes := func () {
1228
1229
// for "/{username}/{reponame}/issues" or "/{username}/{reponame}/pulls"
1229
1230
m .Group ("/{index}" , func () {
1230
1231
m .Post ("/title" , repo .UpdateIssueTitle )
@@ -1267,8 +1268,9 @@ func registerRoutes(m *web.Router) {
1267
1268
m .Delete ("/unpin/{index}" , reqRepoAdmin , repo .IssueUnpin )
1268
1269
m .Post ("/move_pin" , reqRepoAdmin , repo .IssuePinMove )
1269
1270
}
1270
- m .Group ("/{type:issues}" , addIssuesPullsRoutes , reqUnitIssuesReader , context .RepoMustNotBeArchived ())
1271
- m .Group ("/{type:pulls}" , addIssuesPullsRoutes , reqUnitPullsReader , context .RepoMustNotBeArchived ())
1271
+ // FIXME: many "pulls" requests are sent to "issues" endpoints incorrectly, so the issue endpoints have to tolerate pull request permissions at the moment
1272
+ m .Group ("/{type:issues}" , addIssuesPullsUpdateRoutes , context .RequireUnitReader (unit .TypeIssues , unit .TypePullRequests ), context .RepoMustNotBeArchived ())
1273
+ m .Group ("/{type:pulls}" , addIssuesPullsUpdateRoutes , reqUnitPullsReader , context .RepoMustNotBeArchived ())
1272
1274
1273
1275
m .Group ("/comments/{id}" , func () {
1274
1276
m .Post ("" , repo .UpdateCommentContent )
@@ -1292,7 +1294,7 @@ func registerRoutes(m *web.Router) {
1292
1294
m .Post ("/delete" , repo .DeleteMilestone )
1293
1295
}, reqRepoIssuesOrPullsWriter , context .RepoRef ())
1294
1296
1295
- // FIXME: need to move these routes to the proper place
1297
+ // FIXME: many "pulls" requests are sent to "issues" endpoints incorrectly, need to move these routes to the proper place
1296
1298
m .Group ("/issues" , func () {
1297
1299
m .Post ("/request_review" , repo .UpdatePullReviewRequest )
1298
1300
m .Post ("/dismiss_review" , reqRepoAdmin , web .Bind (forms.DismissReviewForm {}), repo .DismissReview )
0 commit comments