Merge pull request #2831 from odinuge/user-search-name

Make user search look in username, name and email
2016-03-15 19:39:12 -04:00 · 2016-03-15 19:39:12 -04:00 · 94d7b62922
parent 2df42e369e 6ccb2d36cf
commit 94d7b62922
1 changed files with 4 additions and 1 deletions
--- a/models/user.go
+++ b/models/user.go
@ -1137,9 +1137,12 @@ func SearchUserByName(opts *SearchUserOptions) (users []*User, _ int64, _ error)
 		opts.Page = 1
 	}

+	searchQuery := "%" + opts.Keyword + "%"
 	users = make([]*User, 0, opts.PageSize)
 	// Append conditions
-	sess := x.Where("lower_name like ?", "%"+opts.Keyword+"%").And("type = ?", opts.Type)
+	sess := x.Where("lower_name like ?", searchQuery).
+		Or("full_name like ?", searchQuery).
+		And("type = ?", opts.Type)

 	var countSess xorm.Session
 	countSess = *sess