File tree Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Expand file tree Collapse file tree 2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -239,10 +239,10 @@ func (u *User) GetEmail() string {
239
239
return u .Email
240
240
}
241
241
242
- // GetAllUsers returns a slice of all users found in DB.
242
+ // GetAllUsers returns a slice of all individual users found in DB.
243
243
func GetAllUsers () ([]* User , error ) {
244
244
users := make ([]* User , 0 )
245
- return users , x .OrderBy ("id" ).Find (& users )
245
+ return users , x .OrderBy ("id" ).Where ( "type = ?" , UserTypeIndividual ). Find (& users )
246
246
}
247
247
248
248
// IsLocal returns true if user login type is LoginPlain.
Original file line number Diff line number Diff line change @@ -141,7 +141,6 @@ func SearchIssues(ctx *context.APIContext) {
141
141
keyword = ""
142
142
}
143
143
var issueIDs []int64
144
- var labelIDs []int64
145
144
if len (keyword ) > 0 && len (repoIDs ) > 0 {
146
145
if issueIDs , err = issue_indexer .SearchIssuesByKeyword (repoIDs , keyword ); err != nil {
147
146
ctx .Error (http .StatusInternalServerError , "SearchIssuesByKeyword" , err )
@@ -176,7 +175,7 @@ func SearchIssues(ctx *context.APIContext) {
176
175
177
176
// Only fetch the issues if we either don't have a keyword or the search returned issues
178
177
// This would otherwise return all issues if no issues were found by the search.
179
- if len (keyword ) == 0 || len (issueIDs ) > 0 || len (labelIDs ) > 0 {
178
+ if len (keyword ) == 0 || len (issueIDs ) > 0 || len (includedLabelNames ) > 0 {
180
179
issuesOpt := & models.IssuesOptions {
181
180
ListOptions : models.ListOptions {
182
181
Page : ctx .QueryInt ("page" ),
You can’t perform that action at this time.
0 commit comments