Fix `admin user list` (#15358) (#15359)

* Fix `admin user list` (#15358)

* fix routers/api/v1/repo/issue.go

diff --git a/models/user.go b/models/user.go
index 098f6af2b374a9f5ceab3e11072cd57872edcabe..67d910659334736485eef50656baa29b88044878 100644 (file)
--- 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.

diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index 683a2a43b7db0398446a01ac8aedfe728c9fee34..79fea25f278c33ba70142a769df5c7bf8ec5d6d9 100644 (file)
--- 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"),