summaryrefslogtreecommitdiffstats
path: root/routers/routes
diff options
context:
space:
mode:
authorElena Neuschild <eneuschild@gmail.com>2021-01-13 05:19:17 +0100
committerGitHub <noreply@github.com>2021-01-12 23:19:17 -0500
commit564030336dbfe1227ec458ecdedc0cfabdd4c1cc (patch)
tree7311fc29a8ed0c112a7891a11c34fbf76d9ad0eb /routers/routes
parent81467e6f35f343b911c09f746deca869a48da4c8 (diff)
downloadgitea-564030336dbfe1227ec458ecdedc0cfabdd4c1cc.tar.gz
gitea-564030336dbfe1227ec458ecdedc0cfabdd4c1cc.zip
Issues overview should not show issues from archived repos (#13220)
* Add lots of comments to user.Issues() * Answered some questions from comments * fix typo in comment * Refac user.Issues(): add func repoIDs * Refac user.Issues(): add func userRepoIDs * Refac user.Issues(): add func issueIDsFromSearch * Refac user.Issues(): improve error handling * Refac user.Issues(): add inline documentation and move variable declarations closer to their usages * Refac user.Issues(): add func repoIDMap * Refac user.Issues(): cleanup * Refac: Separate Issues from Pulls during routing * fix typo in comment * Adapt Unittests to Refactoring * Issue13171: Issue and PR Overviews now ignore archived Repositories * changed some verbatim SQL conditions to builder.Eq * models/issue.go: use OptionalBool properly Co-authored-by: 6543 <6543@obermui.de> * Use IsArchived rather than ExcludeArchivedRepos * fixed broken test after merge * added nil check * Added Unit Test securing Issue 13171 fix * Improved IsArchived filtering in issue.GetUserIssueStats * Removed unused func * Added grouping to avoid returning duplicate repo IDs Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Gitea <gitea@fake.local> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'routers/routes')
-rw-r--r--routers/routes/macaron.go9
1 files changed, 6 insertions, 3 deletions
diff --git a/routers/routes/macaron.go b/routers/routes/macaron.go
index d54cd580d3..66c39b7f82 100644
--- a/routers/routes/macaron.go
+++ b/routers/routes/macaron.go
@@ -199,7 +199,8 @@ func RegisterMacaronRoutes(m *macaron.Macaron) {
}, ignSignIn)
m.Combo("/install", routers.InstallInit).Get(routers.Install).
Post(bindIgnErr(auth.InstallForm{}), routers.InstallPost)
- m.Get("/^:type(issues|pulls)$", reqSignIn, user.Issues)
+ m.Get("/issues", reqSignIn, user.Issues)
+ m.Get("/pulls", reqSignIn, user.Pulls)
m.Get("/milestones", reqSignIn, reqMilestonesDashboardPageEnabled, user.Milestones)
// ***** START: User *****
@@ -447,8 +448,10 @@ func RegisterMacaronRoutes(m *macaron.Macaron) {
m.Group("/:org", func() {
m.Get("/dashboard", user.Dashboard)
m.Get("/dashboard/:team", user.Dashboard)
- m.Get("/^:type(issues|pulls)$", user.Issues)
- m.Get("/^:type(issues|pulls)$/:team", user.Issues)
+ m.Get("/issues", user.Issues)
+ m.Get("/issues/:team", user.Issues)
+ m.Get("/pulls", user.Pulls)
+ m.Get("/pulls/:team", user.Pulls)
m.Get("/milestones", reqMilestonesDashboardPageEnabled, user.Milestones)
m.Get("/milestones/:team", reqMilestonesDashboardPageEnabled, user.Milestones)
m.Get("/members", org.Members)