kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Only show in autocomplete when author active

Browse source
This commit is contained in:
Wei-Meng Lee 2019-04-12 11:59:09 +08:00
parent d25cdca68f
commit 3ef5666783
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/finders/autocomplete/users_finder.rb
View file

@ -31,7 +31,7 @@ module Autocomplete
# Include current user if available to filter by "Me"
items.unshift(current_user) if prepend_current_user?
if prepend_author? && (author = User.find_by_id(author_id))
if (prepend_author? && author = User.find_by_id(author_id)) && author.active?
items.unshift(author)
end
end

5
changelogs/unreleased/weimeng-user-autocomplete-fix.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Only show in autocomplete when author active
merge_request: 27292
author:
type: fixed

16
spec/finders/autocomplete/users_finder_spec.rb
View file

@ -26,9 +26,17 @@ describe Autocomplete::UsersFinder do
it { is_expected.to match_array([project.owner]) }
context 'when author_id passed' do
let(:params) { { author_id: user2.id } }
context 'and author is active' do
let(:params) { { author_id: user1.id } }
it { is_expected.to match_array([project.owner, user2]) }
it { is_expected.to match_array([project.owner, user1]) }
end
context 'and author is blocked' do
let(:params) { { author_id: user2.id } }
it { is_expected.to match_array([project.owner]) }
end
end
end
@ -104,9 +112,9 @@ describe Autocomplete::UsersFinder do
end
context 'when filtered by author_id' do
let(:params) { { author_id: user2.id } }
let(:params) { { author_id: user1.id } }
it { is_expected.to match_array([user2, user1, external_user, omniauth_user, current_user]) }
it { is_expected.to match_array([user1, external_user, omniauth_user, current_user]) }
end
end
end