FIX: Allow integer group_ids for create invite api (#21494)
This fixes a bug in the create invite API where if you passed in an integer for the group_ids field it would fail to add the user to the specified group.
This commit is contained in:
parent
ce5430adc1
commit
bd6e487df0
|
@ -686,7 +686,7 @@ class Group < ActiveRecord::Base
|
||||||
|
|
||||||
def self.lookup_groups(group_ids: [], group_names: [])
|
def self.lookup_groups(group_ids: [], group_names: [])
|
||||||
if group_ids.present?
|
if group_ids.present?
|
||||||
group_ids = group_ids.split(",") if group_ids.is_a?(String)
|
group_ids = group_ids.to_s.split(",") if !group_ids.is_a?(Array)
|
||||||
group_ids.map!(&:to_i)
|
group_ids.map!(&:to_i)
|
||||||
groups = Group.where(id: group_ids) if group_ids.present?
|
groups = Group.where(id: group_ids) if group_ids.present?
|
||||||
end
|
end
|
||||||
|
|
|
@ -579,6 +579,23 @@ RSpec.describe Group do
|
||||||
expect(group.id).to eq Group[group.name.to_sym].id
|
expect(group.id).to eq Group[group.name.to_sym].id
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it "allows you to lookup a group by integer id" do
|
||||||
|
group = Fabricate(:group)
|
||||||
|
expect(group.id).to eq Group.lookup_groups(group_ids: group.id).first.id
|
||||||
|
end
|
||||||
|
|
||||||
|
it "allows you to lookup groups by comma separated string" do
|
||||||
|
group1 = Fabricate(:group)
|
||||||
|
group2 = Fabricate(:group)
|
||||||
|
expect([group1, group2]).to eq Group.lookup_groups(group_ids: "#{group1.id},#{group2.id}")
|
||||||
|
end
|
||||||
|
|
||||||
|
it "allows you to lookup groups by array" do
|
||||||
|
group1 = Fabricate(:group)
|
||||||
|
group2 = Fabricate(:group)
|
||||||
|
expect([group1, group2]).to eq Group.lookup_groups(group_ids: [group1.id, group2.id])
|
||||||
|
end
|
||||||
|
|
||||||
it "can find desired groups correctly" do
|
it "can find desired groups correctly" do
|
||||||
expect(Group.desired_trust_level_groups(2).sort).to eq [10, 11, 12]
|
expect(Group.desired_trust_level_groups(2).sort).to eq [10, 11, 12]
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue