From 074f14bc2173c84411d7c54564fed7f5b2da2d01 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 9 Apr 2021 10:16:10 +0200 Subject: [PATCH 1/2] Fix `admin user list` (#15358) --- models/user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/user.go b/models/user.go index 098f6af2b374a..67d9106593347 100644 --- a/models/user.go +++ b/models/user.go @@ -239,10 +239,10 @@ func (u *User) GetEmail() string { return u.Email } -// GetAllUsers returns a slice of all users found in DB. +// GetAllUsers returns a slice of all individual users found in DB. func GetAllUsers() ([]*User, error) { users := make([]*User, 0) - return users, x.OrderBy("id").Find(&users) + return users, x.OrderBy("id").Where("type = ?", UserTypeIndividual).Find(&users) } // IsLocal returns true if user login type is LoginPlain. From 5c000c816d1ba4a2f8a80f5a790a568523fd13ec Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 5 Apr 2021 04:13:11 +0200 Subject: [PATCH 2/2] fix routers/api/v1/repo/issue.go --- routers/api/v1/repo/issue.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 683a2a43b7db0..79fea25f278c3 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -141,7 +141,6 @@ func SearchIssues(ctx *context.APIContext) { keyword = "" } var issueIDs []int64 - var labelIDs []int64 if len(keyword) > 0 && len(repoIDs) > 0 { if issueIDs, err = issue_indexer.SearchIssuesByKeyword(repoIDs, keyword); err != nil { ctx.Error(http.StatusInternalServerError, "SearchIssuesByKeyword", err) @@ -176,7 +175,7 @@ func SearchIssues(ctx *context.APIContext) { // Only fetch the issues if we either don't have a keyword or the search returned issues // This would otherwise return all issues if no issues were found by the search. - if len(keyword) == 0 || len(issueIDs) > 0 || len(labelIDs) > 0 { + if len(keyword) == 0 || len(issueIDs) > 0 || len(includedLabelNames) > 0 { issuesOpt := &models.IssuesOptions{ ListOptions: models.ListOptions{ Page: ctx.QueryInt("page"),