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

mod reports: remove use of belongs_to_creator macro.

Browse Source 
Remove use of belongs_to_creator macro as per b4ce2d83a.
This commit is contained in:
evazion
2020-01-21 00:23:45 -06:00
parent b5603f0d39
commit f2f236c23a
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/moderation_reports_controller.rb
View File

@@ -16,7 +16,7 @@ class ModerationReportsController < ApplicationController
def create
check_privilege
@moderation_report = ModerationReport.create(moderation_report_params)
@moderation_report = ModerationReport.create(moderation_report_params.merge(creator: CurrentUser.user))
respond_with(@moderation_report)
end

7
app/models/moderation_report.rb
View File

@@ -1,6 +1,6 @@
class ModerationReport < ApplicationRecord
belongs_to :model, polymorphic: true
belongs_to_creator
belongs_to :creator, class_name: "User"
validates :reason, presence: true
after_create :create_forum_post!
@@ -21,8 +21,9 @@ class ModerationReport < ApplicationRecord
def forum_topic
topic = ForumTopic.find_by_title(forum_topic_title)
if topic.nil?
topic = CurrentUser.as_system do
ForumTopic.create(title: forum_topic_title, category_id: 0, min_level: User::Levels::MODERATOR, original_post_attributes: {body: forum_topic_body})
CurrentUser.as_system do
topic = ForumTopic.create!(creator: User.system, title: forum_topic_title, category_id: 0, min_level: User::Levels::MODERATOR)
forum_post = ForumPost.create!(creator: User.system, body: forum_topic_body, topic: topic)
end
end
topic