diff options
| author | Unknwon <u@gogs.io> | 2016-12-27 20:32:27 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-12-27 20:32:27 +0800 |
| commit | f8fd084bd2c7c2a4d642daad59dceaf40686269e (patch) | |
| tree | 843c2f95ada73b5d1d0713df8963930105033b70 /routers | |
| parent | d528704503423dc182a95e2ee414a780edd92c50 (diff) | |
Fix dashboard issue/pull request scoping
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/user/home.go | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/routers/user/home.go b/routers/user/home.go index d49bce1b..d1a58356 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -202,37 +202,37 @@ func Issues(ctx *context.Context) { userRepoIDs []int64 showRepos = make([]*models.Repository, 0, 10) ) - if filterMode == models.FILTER_MODE_YOUR_REPOS { - if ctxUser.IsOrganization() { - repos, _, err = ctxUser.GetUserRepositories(ctx.User.ID, 1, ctxUser.NumRepos) - if err != nil { - ctx.Handle(500, "GetRepositories", err) - return + if ctxUser.IsOrganization() { + repos, _, err = ctxUser.GetUserRepositories(ctx.User.ID, 1, ctxUser.NumRepos) + if err != nil { + ctx.Handle(500, "GetRepositories", err) + return + } + } else { + if err := ctxUser.GetRepositories(1, ctx.User.NumRepos); err != nil { + ctx.Handle(500, "GetRepositories", err) + return + } + repos = ctxUser.Repos + } + + userRepoIDs = make([]int64, 0, len(repos)) + for _, repo := range repos { + if isPullList { + if isShowClosed && repo.NumClosedPulls == 0 || + !isShowClosed && repo.NumOpenPulls == 0 { + continue } } else { - if err := ctxUser.GetRepositories(1, ctx.User.NumRepos); err != nil { - ctx.Handle(500, "GetRepositories", err) - return + if !repo.EnableIssues || repo.EnableExternalTracker || + isShowClosed && repo.NumClosedIssues == 0 || + !isShowClosed && repo.NumOpenIssues == 0 { + continue } - repos = ctxUser.Repos } - userRepoIDs = make([]int64, 0, len(repos)) - for _, repo := range repos { - if isPullList { - if isShowClosed && repo.NumClosedPulls == 0 || - !isShowClosed && repo.NumOpenPulls == 0 { - continue - } - } else { - if !repo.EnableIssues || repo.EnableExternalTracker || - isShowClosed && repo.NumClosedIssues == 0 || - !isShowClosed && repo.NumOpenIssues == 0 { - continue - } - } - - userRepoIDs = append(userRepoIDs, repo.ID) + userRepoIDs = append(userRepoIDs, repo.ID) + if filterMode == models.FILTER_MODE_YOUR_REPOS { showRepos = append(showRepos, repo) } } |