jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix topic merge

Browse Source 
It was merging in the wrong direction, and didn't update response count.
This commit is contained in:
Toks
2014-11-12 01:20:27 -05:00
parent 30700df635
commit 2ee548dc85
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/forum_topics_controller.rb
View File

@@ -78,7 +78,7 @@ class ForumTopicsController < ApplicationController
@forum_topic = ForumTopic.find(params[:id]) @forum_topic = ForumTopic.find(params[:id])
@merged_topic = ForumTopic.find(params[:merged_id]) @merged_topic = ForumTopic.find(params[:merged_id])
@forum_topic.merge(@merged_topic) @forum_topic.merge(@merged_topic)
redirect_to forum_topic_path(@forum_topic) redirect_to forum_topic_path(@merged_topic)
end end
private private

5
app/models/forum_topic.rb
View File

@@ -151,7 +151,8 @@ class ForumTopic < ActiveRecord::Base
end end
def merge(topic) def merge(topic)
ForumPost.where(:id => topic.posts.map(&:id)).update_all(:topic_id => id) ForumPost.where(:id => self.posts.map(&:id)).update_all(:topic_id => topic.id)
update_attribute(:is_deleted, true) topic.update_attribute(:response_count, topic.response_count + self.posts.length)
self.update_columns(:response_count => 0, :is_deleted => true)
end end
end end