discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 11:19:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: tag groups were not visible to allowed group members (#17183)

Browse Source 
https://meta.discourse.org/t/tags-in-tag-groups-not-visible-to-assigned-user-group/230025/
This commit is contained in:
Arpit Jalan 2022-06-21 23:40:54 +05:30 committed by GitHub
parent 46622be72b
commit 59f0815c9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/tag_group.rb
View File

@ -95,10 +95,10 @@ class TagGroup < ActiveRecord::Base
OR OR
id NOT IN (SELECT tag_group_id FROM category_tag_groups) id NOT IN (SELECT tag_group_id FROM category_tag_groups)
) )
AND id IN (SELECT tag_group_id FROM tag_group_permissions WHERE group_id = ?) AND id IN (SELECT tag_group_id FROM tag_group_permissions WHERE group_id IN (?))
SQL SQL
TagGroup.where(filter_sql, guardian.allowed_category_ids, Group::AUTO_GROUPS[:everyone]) TagGroup.where(filter_sql, guardian.allowed_category_ids, DiscourseTagging.permitted_group_ids(guardian))
end end
end end
end end

12
spec/models/tag_group_spec.rb
View File

@ -8,10 +8,12 @@ describe TagGroup do
fab!(:moderator) { Fabricate(:moderator) } fab!(:moderator) { Fabricate(:moderator) }
fab!(:group) { Fabricate(:group) } fab!(:group) { Fabricate(:group) }
fab!(:beta_group) { Fabricate(:group) }
fab!(:everyone_tag_group) { Fabricate(:tag_group, name: 'Visible & usable by everyone', tag_names: ['foo-bar']) } fab!(:everyone_tag_group) { Fabricate(:tag_group, name: 'Visible & usable by everyone', tag_names: ['foo-bar']) }
fab!(:visible_tag_group) { Fabricate(:tag_group, name: 'Visible by everyone, usable by staff', tag_names: ['foo']) } fab!(:visible_tag_group) { Fabricate(:tag_group, name: 'Visible by everyone, usable by staff', tag_names: ['foo']) }
fab!(:staff_only_tag_group) { Fabricate(:tag_group, name: 'Staff only', tag_names: ['bar']) } fab!(:staff_only_tag_group) { Fabricate(:tag_group, name: 'Staff only', tag_names: ['bar']) }
fab!(:beta_only_tag_group) { Fabricate(:tag_group, name: 'Beta only', tag_names: ['beta']) }
fab!(:public_tag_group) { Fabricate(:tag_group, name: 'Public', tag_names: ['public1']) } fab!(:public_tag_group) { Fabricate(:tag_group, name: 'Public', tag_names: ['public1']) }
fab!(:private_tag_group) { Fabricate(:tag_group, name: 'Private', tag_names: ['privatetag1']) } fab!(:private_tag_group) { Fabricate(:tag_group, name: 'Private', tag_names: ['privatetag1']) }
@ -32,6 +34,9 @@ describe TagGroup do
group.add(user2) group.add(user2)
group.save! group.save!
beta_group.add(user1)
beta_group.save!
staff_category.set_permissions(admins: :full) staff_category.set_permissions(admins: :full)
staff_category.save! staff_category.save!
@ -50,6 +55,9 @@ describe TagGroup do
staff_only_tag_group.permissions = [[staff, full]] staff_only_tag_group.permissions = [[staff, full]]
staff_only_tag_group.save! staff_only_tag_group.save!
beta_only_tag_group.permissions = [[beta_group, full]]
beta_only_tag_group.save!
end end
shared_examples "correct visible tag groups" do shared_examples "correct visible tag groups" do
@ -63,8 +71,8 @@ describe TagGroup do
]) ])
expect(TagGroup.visible(Guardian.new(user1)).pluck(:name)).to match_array([ expect(TagGroup.visible(Guardian.new(user1)).pluck(:name)).to match_array([
public_tag_group.name, unrestricted_tag_group.name, everyone_tag_group.name, public_tag_group.name, unrestricted_tag_group.name, beta_only_tag_group.name,
visible_tag_group.name, everyone_tag_group.name, visible_tag_group.name,
]) ])
expect(TagGroup.visible(Guardian.new(nil)).pluck(:name)).to match_array([ expect(TagGroup.visible(Guardian.new(nil)).pluck(:name)).to match_array([