6543
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
4 deletions
-
models/user.go
-
routers/api/v1/repo/issue.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.
|
|
|
|
|
|
@ -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"), |
|
|
|