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

fix linting to make stree happy

This commit is contained in:
Vinoth Kannan 2023-05-26 06:22:01 +05:30
parent 9ae46db270
commit 772a544b1d
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/assigner.rb
View File

@ -461,10 +461,13 @@ class ::Assigner
def invite_group(group) def invite_group(group)
return if topic.topic_allowed_groups.exists?(group_id: group.id) return if topic.topic_allowed_groups.exists?(group_id: group.id)
return if topic.all_allowed_users if topic
.joins("RIGHT JOIN group_users ON group_users.user_id = users.id") .all_allowed_users
.where("group_users.group_id = ? AND users.id IS NULL", group.id) .joins("RIGHT JOIN group_users ON group_users.user_id = users.id")
.empty? # all group members can already see the topic .where("group_users.group_id = ? AND users.id IS NULL", group.id)
.empty?
return # all group members can already see the topic
end
guardian.ensure_can_invite_group_to_private_message!(group, topic) guardian.ensure_can_invite_group_to_private_message!(group, topic)
topic.invite_group(@assigned_by, group) topic.invite_group(@assigned_by, group)

15
spec/lib/assigner_spec.rb
View File

@ -747,13 +747,14 @@ RSpec.describe Assigner do
it "doesn't invite group if all members have access to the PM already" do it "doesn't invite group if all members have access to the PM already" do
user1, user2, user3 = 3.times.collect { Fabricate(:user) } user1, user2, user3 = 3.times.collect { Fabricate(:user) }
group1, group2, group3 = 3.times.collect do group1, group2, group3 =
Fabricate( 3.times.collect do
:group, Fabricate(
assignable_level: Group::ALIAS_LEVELS[:only_admins], :group,
messageable_level: Group::ALIAS_LEVELS[:only_admins], assignable_level: Group::ALIAS_LEVELS[:only_admins],
) messageable_level: Group::ALIAS_LEVELS[:only_admins],
end )
end
group1.add(user1) group1.add(user1)
group1.add(user3) group1.add(user3)
group2.add(user2) group2.add(user2)