From 3253e3c5aaf19f8cb8dda20b2a01aafe36d28066 Mon Sep 17 00:00:00 2001 From: Odin Ugedal Date: Tue, 15 Mar 2016 14:16:58 +0100 Subject: [PATCH] Make user search look in username, name and email Make user search function look in username (lower_name), full name (full_name) and primary email (email). This will benefit searching after user in "explore", admin panel and when adding new collaborators. --- models/user.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/models/user.go b/models/user.go index 82f927891..93db70a41 100644 --- a/models/user.go +++ b/models/user.go @@ -1137,9 +1137,13 @@ 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). + Or("email like ?", searchQuery). + And("type = ?", opts.Type) var countSess xorm.Session countSess = *sess