From eeecb2460dc946bb5b18e43fc35455b57cd6326d Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Tue, 12 Oct 2021 12:01:18 +0530 Subject: [PATCH] FIX: nil the baked version after moving the posts. (#14483) Previosuly, quotes from original topics are rendered incorrectly since the moved posts are not rebaked. Co-authored-by: Alan Guo Xiang Tan --- app/models/post.rb | 9 ++++----- app/models/post_mover.rb | 3 ++- spec/models/post_mover_spec.rb | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/models/post.rb b/app/models/post.rb index 0c9af4a381b..5ff7f934c8c 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -732,12 +732,11 @@ class Post < ActiveRecord::Base before_save do self.last_editor_id ||= user_id - if !new_record? && will_save_change_to_raw? - self.cooked = cook(raw, topic_id: topic_id) + if will_save_change_to_raw? + self.cooked = cook(raw, topic_id: topic_id) if !new_record? + self.baked_at = Time.zone.now + self.baked_version = BAKED_VERSION end - - self.baked_at = Time.zone.now - self.baked_version = BAKED_VERSION end def advance_draft_sequence diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb index 3c280eceff5..e24b9827d86 100644 --- a/app/models/post_mover.rb +++ b/app/models/post_mover.rb @@ -191,7 +191,8 @@ class PostMover post_number: @move_map[post.post_number], reply_to_post_number: @move_map[post.reply_to_post_number], topic_id: destination_topic.id, - sort_order: @move_map[post.post_number] + sort_order: @move_map[post.post_number], + baked_version: nil } unless @move_map[post.reply_to_post_number] diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb index a689c35ab6f..0cb72a5a715 100644 --- a/spec/models/post_mover_spec.rb +++ b/spec/models/post_mover_spec.rb @@ -120,7 +120,8 @@ describe PostMover do .to change { p2.reload.topic_id } .and change { p2.post_number } .and change { p3.reload.raw } - .and change { p3.baked_version }.to nil + .and change { p2.baked_version }.to(nil) + .and change { p3.baked_version }.to(nil) expect(p3.raw).to include("post:#{p2.post_number}, topic:#{p2.topic_id}") end