FIX: Don't lock a post on edit unless the raw changes
This commit is contained in:
parent
5c93d07d2a
commit
b3883f5c32
|
@ -167,9 +167,12 @@ class PostRevisor
|
|||
end
|
||||
|
||||
# Lock the post by default if the appropriate setting is true
|
||||
if SiteSetting.staff_edit_locks_post? &&
|
||||
@editor.staff? &&
|
||||
!@post.user.staff?
|
||||
if (
|
||||
SiteSetting.staff_edit_locks_post? &&
|
||||
@fields.has_key?('raw') &&
|
||||
@editor.staff? &&
|
||||
!@post.user.staff?
|
||||
)
|
||||
PostLocker.new(@post, @editor).lock
|
||||
end
|
||||
|
||||
|
|
|
@ -452,6 +452,18 @@ describe PostRevisor do
|
|||
expect(post).to be_locked
|
||||
end
|
||||
|
||||
it "doesn't lock the post when the raw did not change" do
|
||||
result = subject.revise!(
|
||||
moderator,
|
||||
title: "New topic title, cool!"
|
||||
)
|
||||
expect(result).to eq(true)
|
||||
post.reload
|
||||
expect(post.topic.title).to eq("New topic title, cool!")
|
||||
expect(post).not_to be_locked
|
||||
end
|
||||
|
||||
|
||||
it "doesn't lock the post when revised by a regular user" do
|
||||
result = subject.revise!(
|
||||
Fabricate(:user),
|
||||
|
|
Loading…
Reference in New Issue