Revert "FIX: TL4 user can see deleted topics (#19946)"
This reverts commit d725c41d18
which is
a 3.1 feature.
This commit is contained in:
parent
87b95356f7
commit
5849c81f1d
|
@ -209,8 +209,7 @@ module TopicGuardian
|
||||||
end
|
end
|
||||||
|
|
||||||
def can_see_deleted_topics?(category)
|
def can_see_deleted_topics?(category)
|
||||||
is_staff? || is_category_group_moderator?(category) ||
|
is_staff? || is_category_group_moderator?(category)
|
||||||
(SiteSetting.tl4_delete_posts_and_topics && user.has_trust_level?(TrustLevel[4]))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Accepts an array of `Topic#id` and returns an array of `Topic#id` which the user can see.
|
# Accepts an array of `Topic#id` and returns an array of `Topic#id` which the user can see.
|
||||||
|
|
|
@ -74,27 +74,6 @@ RSpec.describe TopicGuardian do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "#can_see_deleted_topics?" do
|
|
||||||
it "returns true for staff" do
|
|
||||||
expect(Guardian.new(admin).can_see_deleted_topics?(topic.category)).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it "returns true for group moderator" do
|
|
||||||
SiteSetting.enable_category_group_moderation = true
|
|
||||||
expect(Guardian.new(user).can_see_deleted_topics?(topic.category)).to eq(false)
|
|
||||||
category.update!(reviewable_by_group_id: group.id)
|
|
||||||
group.add(user)
|
|
||||||
topic.update!(category: category)
|
|
||||||
expect(Guardian.new(user).can_see_deleted_topics?(topic.category)).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it "returns true when tl4 can delete posts and topics" do
|
|
||||||
expect(Guardian.new(tl4_user).can_see_deleted_topics?(topic.category)).to eq(false)
|
|
||||||
SiteSetting.tl4_delete_posts_and_topics = true
|
|
||||||
expect(Guardian.new(tl4_user).can_see_deleted_topics?(topic.category)).to eq(true)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "#can_edit_topic?" do
|
describe "#can_edit_topic?" do
|
||||||
context "when the topic is a shared draft" do
|
context "when the topic is a shared draft" do
|
||||||
let(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }
|
let(:tl2_user) { Fabricate(:user, trust_level: TrustLevel[2]) }
|
||||||
|
|
Loading…
Reference in New Issue