fix linting to make stree happy
This commit is contained in:
parent
9ae46db270
commit
772a544b1d
|
|
@ -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
|
||||||
|
.all_allowed_users
|
||||||
.joins("RIGHT JOIN group_users ON group_users.user_id = users.id")
|
.joins("RIGHT JOIN group_users ON group_users.user_id = users.id")
|
||||||
.where("group_users.group_id = ? AND users.id IS NULL", group.id)
|
.where("group_users.group_id = ? AND users.id IS NULL", group.id)
|
||||||
.empty? # all group members can already see the topic
|
.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)
|
||||||
|
|
|
||||||
|
|
@ -747,7 +747,8 @@ 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 =
|
||||||
|
3.times.collect do
|
||||||
Fabricate(
|
Fabricate(
|
||||||
:group,
|
:group,
|
||||||
assignable_level: Group::ALIAS_LEVELS[:only_admins],
|
assignable_level: Group::ALIAS_LEVELS[:only_admins],
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue