Merge pull request #3623 from riking/patch-6
FIX: Change post owner of deleted post, take 3
This commit is contained in:
commit
84e0135723
|
@ -16,7 +16,6 @@ class PostOwnerChanger
|
||||||
@topic.user = @new_owner if post.is_first_post?
|
@topic.user = @new_owner if post.is_first_post?
|
||||||
|
|
||||||
if post.user == nil
|
if post.user == nil
|
||||||
post.recover!
|
|
||||||
@topic.recover! if post.is_first_post?
|
@topic.recover! if post.is_first_post?
|
||||||
end
|
end
|
||||||
post.topic = @topic
|
post.topic = @topic
|
||||||
|
|
|
@ -258,7 +258,6 @@ describe TopicsController do
|
||||||
t2.reload
|
t2.reload
|
||||||
p3.reload
|
p3.reload
|
||||||
expect(t2.deleted_at).to be_nil
|
expect(t2.deleted_at).to be_nil
|
||||||
expect(p3.deleted_at).to be_nil
|
|
||||||
expect(p3.user).to eq(user_a)
|
expect(p3.user).to eq(user_a)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue