troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 20:59:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Return empty when searching issues with no repos (#26545)

Browse source
This commit is contained in:
Jason Song 2023-08-18 01:42:17 +08:00 committed by GitHub
parent 47fddaadc8
commit b658f2c61b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routers/api/v1/repo/issue.go
View file

@ -193,6 +193,10 @@ func SearchIssues(ctx *context.APIContext) {
ctx.Error(http.StatusInternalServerError, "SearchRepositoryIDs", err) ctx.Error(http.StatusInternalServerError, "SearchRepositoryIDs", err)
return return
} }
if len(repoIDs) == 0 {
// no repos found, don't let the indexer return all repos
repoIDs = []int64{0}
}
} }
keyword := ctx.FormTrim("q") keyword := ctx.FormTrim("q")

4
routers/web/repo/issue.go
View file

@ -2503,6 +2503,10 @@ func SearchIssues(ctx *context.Context) {
ctx.Error(http.StatusInternalServerError, "SearchRepositoryIDs", err.Error()) ctx.Error(http.StatusInternalServerError, "SearchRepositoryIDs", err.Error())
return return
} }
if len(repoIDs) == 0 {
// no repos found, don't let the indexer return all repos
repoIDs = []int64{0}
}
} }
keyword := ctx.FormTrim("q") keyword := ctx.FormTrim("q")

20
routers/web/user/home.go
View file

@ -454,10 +454,21 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
AllPublic: false, AllPublic: false,
AllLimited: false, AllLimited: false,
} }
if team != nil { if team != nil {
repoOpts.TeamID = team.ID repoOpts.TeamID = team.ID
} }
{
ids, _, err := repo_model.SearchRepositoryIDs(repoOpts)
if err != nil {
ctx.ServerError("SearchRepositoryIDs", err)
return
}
opts.RepoIDs = ids
if len(opts.RepoIDs) == 0 {
// no repos found, don't let the indexer return all repos
opts.RepoIDs = []int64{0}
}
}
switch filterMode { switch filterMode {
case issues_model.FilterModeAll: case issues_model.FilterModeAll:
@ -541,15 +552,13 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
// Parse ctx.FormString("repos") and remember matched repo IDs for later. // Parse ctx.FormString("repos") and remember matched repo IDs for later.
// Gets set when clicking filters on the issues overview page. // Gets set when clicking filters on the issues overview page.
repoIDs := getRepoIDs(ctx.FormString("repos")) repoIDs := getRepoIDs(ctx.FormString("repos"))
if len(repoIDs) == 0 { if len(repoIDs) > 0 {
repoIDs = accessibleRepos.Values()
} else {
// Remove repo IDs that are not accessible to the user. // Remove repo IDs that are not accessible to the user.
repoIDs = util.SliceRemoveAllFunc(repoIDs, func(v int64) bool { repoIDs = util.SliceRemoveAllFunc(repoIDs, func(v int64) bool {
return !accessibleRepos.Contains(v) return !accessibleRepos.Contains(v)
}) })
opts.RepoIDs = repoIDs
} }
opts.RepoIDs = repoIDs
// ------------------------------ // ------------------------------
// Get issues as defined by opts. // Get issues as defined by opts.
@ -609,6 +618,7 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
var issueStats *issues_model.IssueStats var issueStats *issues_model.IssueStats
{ {
statsOpts := issues_model.IssuesOptions{ statsOpts := issues_model.IssuesOptions{
RepoIDs: repoIDs,
User: ctx.Doer, User: ctx.Doer,
IsPull: util.OptionalBoolOf(isPullList), IsPull: util.OptionalBoolOf(isPullList),
IsClosed: util.OptionalBoolOf(isShowClosed), IsClosed: util.OptionalBoolOf(isShowClosed),