forked from gitea/gitea
		
	Add support for search by uid (#4876)
Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
		
							parent
							
								
									7bb4d610e5
								
							
						
					
					
						commit
						dd62ca7ba9
					
				| @ -1337,6 +1337,7 @@ func GetUser(user *User) (bool, error) { | ||||
| type SearchUserOptions struct { | ||||
| 	Keyword       string | ||||
| 	Type          UserType | ||||
| 	UID           int64 | ||||
| 	OrderBy       SearchOrderBy | ||||
| 	Page          int | ||||
| 	PageSize      int // Can be smaller than or equal to setting.UI.ExplorePagingNum | ||||
| @ -1355,9 +1356,14 @@ func (opts *SearchUserOptions) toConds() builder.Cond { | ||||
| 		if opts.SearchByEmail { | ||||
| 			keywordCond = keywordCond.Or(builder.Like{"LOWER(email)", lowerKeyword}) | ||||
| 		} | ||||
| 
 | ||||
| 		cond = cond.And(keywordCond) | ||||
| 	} | ||||
| 
 | ||||
| 	if opts.UID > 0 { | ||||
| 		cond = cond.And(builder.Eq{"id": opts.UID}) | ||||
| 	} | ||||
| 
 | ||||
| 	if !opts.IsActive.IsNone() { | ||||
| 		cond = cond.And(builder.Eq{"is_active": opts.IsActive.IsTrue()}) | ||||
| 	} | ||||
|  | ||||
| @ -27,6 +27,10 @@ func Search(ctx *context.APIContext) { | ||||
| 	//   in: query | ||||
| 	//   description: keyword | ||||
| 	//   type: string | ||||
| 	// - name: uid | ||||
| 	//   in: query | ||||
| 	//   description: ID of the user to search for | ||||
| 	//   type: integer | ||||
| 	// - name: limit | ||||
| 	//   in: query | ||||
| 	//   description: maximum number of users to return | ||||
| @ -45,6 +49,7 @@ func Search(ctx *context.APIContext) { | ||||
| 	//             "$ref": "#/definitions/User" | ||||
| 	opts := &models.SearchUserOptions{ | ||||
| 		Keyword:  strings.Trim(ctx.Query("q"), " "), | ||||
| 		UID:      com.StrTo(ctx.Query("uid")).MustInt64(), | ||||
| 		Type:     models.UserTypeIndividual, | ||||
| 		PageSize: com.StrTo(ctx.Query("limit")).MustInt(), | ||||
| 	} | ||||
|  | ||||
| @ -5203,6 +5203,12 @@ | ||||
|             "name": "q", | ||||
|             "in": "query" | ||||
|           }, | ||||
|           { | ||||
|             "type": "integer", | ||||
|             "description": "ID of the user to search for", | ||||
|             "name": "uid", | ||||
|             "in": "query" | ||||
|           }, | ||||
|           { | ||||
|             "type": "integer", | ||||
|             "description": "maximum number of users to return", | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 zeripath
						zeripath