Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-09 12:54:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Admins not able to convert topics if they aren't in personal_message_enabled_groups (#23399)

Browse Source 
Admins are always able to send PMs, so it doesn't make
sense that they shouldn't be able to convert topics just
because they aren't in personal_message_enabled_groups.
This commit is contained in:
Martin Brennan 2023-09-06 09:17:40 +10:00 committed by GitHub
parent 152a99b3f4
commit de9b567c19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/guardian/topic_guardian.rb
View File

@ -201,11 +201,11 @@ module TopicGuardian
alias can_create_unlisted_topic? can_toggle_topic_visibility? alias can_create_unlisted_topic? can_toggle_topic_visibility?
def can_convert_topic?(topic) def can_convert_topic?(topic)
return false unless @user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
return false if topic.blank? return false if topic.blank?
return false if topic.trashed? return false if topic.trashed?
return false if topic.is_category_topic? return false if topic.is_category_topic?
return true if is_admin? return true if is_admin?
return false if !@user.in_any_groups?(SiteSetting.personal_message_enabled_groups_map)
is_moderator? && can_create_post?(topic) is_moderator? && can_create_post?(topic)
end end

5
spec/lib/guardian_spec.rb
View File

@ -1542,6 +1542,11 @@ RSpec.describe Guardian do
SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4] SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
expect(Guardian.new(user).can_convert_topic?(topic)).to be_falsey expect(Guardian.new(user).can_convert_topic?(topic)).to be_falsey
end end
it "returns true if user is not in personal_message_enabled_groups but they are still admin" do
SiteSetting.personal_message_enabled_groups = Group::AUTO_GROUPS[:trust_level_4]
expect(Guardian.new(admin).can_convert_topic?(topic)).to be_truthy
end
end end
describe "can_edit?" do describe "can_edit?" do