Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bug fixed on issues and pulls

Browse source
This commit is contained in:
Lunny Xiao 2017-02-15 00:02:03 +08:00 committed by Kim "BKC" Carlbäcker
parent cf47532ebc
commit 9c645b54dc
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
models/org.go
View file

@ -657,7 +657,6 @@ func (env *accessibleReposEnv) Repos(page, pageSize int) ([]*Repository, error)
} }
repos := make([]*Repository, 0, len(repoIDs)) repos := make([]*Repository, 0, len(repoIDs))
if len(repoIDs) <= 0 { if len(repoIDs) <= 0 {
return repos, nil return repos, nil
} }

27
routers/user/home.go
View file

@ -227,13 +227,6 @@ func Issues(ctx *context.Context) {
ctx.Handle(500, "GetRepositories", err) ctx.Handle(500, "GetRepositories", err)
return return
} }
} else {
if err := ctxUser.GetRepositories(1, ctx.User.NumRepos); err != nil {
ctx.Handle(500, "GetRepositories", err)
return
}
repos = ctxUser.Repos
}
for _, repo := range repos { for _, repo := range repos {
if (isPullList && repo.NumPulls == 0) || if (isPullList && repo.NumPulls == 0) ||
@ -245,6 +238,26 @@ func Issues(ctx *context.Context) {
userRepoIDs = append(userRepoIDs, repo.ID) userRepoIDs = append(userRepoIDs, repo.ID)
} }
if len(userRepoIDs) <= 0 {
userRepoIDs = []int64{-1}
}
} else {
if err := ctxUser.GetRepositories(1, ctx.User.NumRepos); err != nil {
ctx.Handle(500, "GetRepositories", err)
return
}
repos = ctxUser.Repos
for _, repo := range repos {
if (isPullList && repo.NumPulls == 0) ||
(!isPullList &&
(!repo.EnableUnit(models.UnitTypeIssues) || repo.NumIssues == 0)) {
continue
}
}
}
var issues []*models.Issue var issues []*models.Issue
switch filterMode { switch filterMode {
case models.FilterModeAll: case models.FilterModeAll: