discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Correct assign user autocomplete logic 

Previously we were only autocompleting users which were in the same group as the acting user.
This commit is contained in:
David Taylor 2020-04-28 13:55:17 +01:00
parent 71fe8a54c0
commit 07c13651c6
No known key found for this signature in database
GPG Key ID: 46904C18B1D3F434
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/discourse_assign/assign_controller.rb
View File

@ -24,7 +24,7 @@ module DiscourseAssign
.limit(6) .limit(6)
render json: { render json: {
assign_allowed_on_groups: current_user.visible_groups.assign_allowed_groups.pluck(:name), assign_allowed_on_groups: Group.visible_groups(current_user).assign_allowed_groups.pluck(:name),
suggestions: ActiveModel::ArraySerializer.new(users, scope: guardian, each_serializer: BasicUserSerializer) suggestions: ActiveModel::ArraySerializer.new(users, scope: guardian, each_serializer: BasicUserSerializer)
} }
end end

1
assets/javascripts/discourse/templates/modal/assign-user.hbs
View File

@ -4,7 +4,6 @@
{{user-selector {{user-selector
single=true single=true
allowAny=false allowAny=false
group="staff"
groupMembersOf=allowedGroups groupMembersOf=allowedGroups
excludeCurrentUser=false excludeCurrentUser=false
includeMentionableGroups=false includeMentionableGroups=false

9
spec/requests/assign_controller_spec.rb
View File

@ -11,6 +11,7 @@ RSpec.describe DiscourseAssign::AssignController do
let(:user) { Fabricate(:admin, groups: [default_allowed_group]) } let(:user) { Fabricate(:admin, groups: [default_allowed_group]) }
let(:post) { Fabricate(:post) } let(:post) { Fabricate(:post) }
let(:user2) { Fabricate(:active_user) } let(:user2) { Fabricate(:active_user) }
let(:nonadmin) { Fabricate(:user, groups: [default_allowed_group]) }
describe 'only allow users from allowed groups' do describe 'only allow users from allowed groups' do
before { sign_in(user2) } before { sign_in(user2) }
@ -56,9 +57,11 @@ RSpec.describe DiscourseAssign::AssignController do
end end
it 'does include only visible assign_allowed_on_groups' do it 'does include only visible assign_allowed_on_groups' do
visible_group = Fabricate(:group, members_visibility_level: Group.visibility_levels[:members]) sign_in(nonadmin) # Need to use nonadmin to test. Admins can see all groups
visible_group.add(user)
invisible_group = Fabricate(:group, members_visibility_level: Group.visibility_levels[:members]) visible_group = Fabricate(:group, visibility_level: Group.visibility_levels[:members])
visible_group.add(nonadmin)
invisible_group = Fabricate(:group, visibility_level: Group.visibility_levels[:members])
SiteSetting.assign_allowed_on_groups = "#{visible_group.id}|#{invisible_group.id}" SiteSetting.assign_allowed_on_groups = "#{visible_group.id}|#{invisible_group.id}"