FIX: Do not show unconfirmed users in search results
This commit is contained in:
parent
2a70c381f7
commit
38d901ac91
|
@ -263,7 +263,7 @@ class Search
|
||||||
|
|
||||||
def user_search
|
def user_search
|
||||||
users = User.includes(:user_search_data)
|
users = User.includes(:user_search_data)
|
||||||
.where("user_search_data.search_data @@ #{ts_query("simple")}")
|
.where("active = true AND user_search_data.search_data @@ #{ts_query("simple")}")
|
||||||
.order("CASE WHEN username_lower = '#{@original_term.downcase}' THEN 0 ELSE 1 END")
|
.order("CASE WHEN username_lower = '#{@original_term.downcase}' THEN 0 ELSE 1 END")
|
||||||
.order("last_posted_at DESC")
|
.order("last_posted_at DESC")
|
||||||
.limit(@limit)
|
.limit(@limit)
|
||||||
|
|
|
@ -87,6 +87,15 @@ describe Search do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'inactive users' do
|
||||||
|
let!(:inactive_user) { Fabricate(:inactive_user, active: false) }
|
||||||
|
let(:result) { Search.execute('bruce') }
|
||||||
|
|
||||||
|
it 'does not return a result' do
|
||||||
|
result.users.length.should == 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context 'topics' do
|
context 'topics' do
|
||||||
let(:post) { Fabricate(:post) }
|
let(:post) { Fabricate(:post) }
|
||||||
let(:topic) { post.topic}
|
let(:topic) { post.topic}
|
||||||
|
|
|
@ -32,6 +32,13 @@ Fabricator(:walter_white, from: :user) do
|
||||||
password 'letscook'
|
password 'letscook'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Fabricator(:inactive_user, from: :user) do
|
||||||
|
name 'Inactive User'
|
||||||
|
username 'inactive_user'
|
||||||
|
email 'inactive@idontexist.com'
|
||||||
|
active false
|
||||||
|
end
|
||||||
|
|
||||||
Fabricator(:moderator, from: :user) do
|
Fabricator(:moderator, from: :user) do
|
||||||
name { sequence(:name) {|i| "A#{i} Moderator"} }
|
name { sequence(:name) {|i| "A#{i} Moderator"} }
|
||||||
username { sequence(:username) {|i| "moderator#{i}"} }
|
username { sequence(:username) {|i| "moderator#{i}"} }
|
||||||
|
|
Loading…
Reference in New Issue