github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 23:36:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: moderators should be able to search users by email

Browse Source
This commit is contained in:
Régis Hanol
2014-10-29 22:08:41 +01:00
parent 250bee6a91
commit 6e053942a4
6 changed files with 16 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/admin_user_index_query.rb
View File

@ -36,18 +36,10 @@ class AdminUserIndexQuery
def filter_by_search
if params[:filter].present?
if params[:admin] == true
if params[:filter] =~ Resolv::IPv4::Regex || params[:filter] =~ Resolv::IPv6::Regex
@query.where('ip_address = :ip OR registration_ip_address = :ip', ip: params[:filter])
else
@query.where('username_lower ILIKE :filter OR email ILIKE :filter', filter: "%#{params[:filter]}%")
end
if params[:filter] =~ Resolv::IPv4::Regex || params[:filter] =~ Resolv::IPv6::Regex
@query.where('ip_address = :ip OR registration_ip_address = :ip', ip: params[:filter])
else
if params[:filter] =~ Resolv::IPv4::Regex || params[:filter] =~ Resolv::IPv6::Regex
@query.where('ip_address = :ip OR registration_ip_address = :ip', ip: params[:filter])
else
@query.where('username_lower ILIKE :filter', filter: "%#{params[:filter]}%")
end
@query.where('username_lower ILIKE :filter OR email ILIKE :filter', filter: "%#{params[:filter]}%")
end
end
end