FEATURE: List moderator warnings on admin dashboard

app/models/notification.rb

@@ -98,7 +98,7 @@ class Notification < ActiveRecord::Base
 
   def self.recent_report(user, count = nil)
     count ||= 10
-    notifications = user.notifications.recent(count).includes({:topic => :warning}).to_a
+    notifications = user.notifications.recent(count).includes(:topic).to_a
 
     if notifications.present?
       notifications += user.notifications

app/serializers/listable_topic_serializer.rb

@@ -39,7 +39,7 @@ class ListableTopicSerializer < BasicTopicSerializer
   end
 
   def is_warning
-    object.private_message? && object.warning.present?
+    object.subtype == TopicSubtype.moderator_warning
   end
 
   def include_is_warning?

app/serializers/notification_serializer.rb

@@ -14,7 +14,7 @@ class NotificationSerializer < ApplicationSerializer
   end
 
   def is_warning
-    object.topic.present? && object.topic.warning.present?
+    object.topic.present? && object.topic.subtype == TopicSubtype.moderator_warning
   end
 
   def include_is_warning?

app/serializers/topic_view_serializer.rb

@@ -113,7 +113,7 @@ class TopicViewSerializer < ApplicationSerializer
 
 
   def is_warning
-    object.topic.private_message? && object.topic.warning.present?
+    object.topic.private_message? && object.topic.subtype == TopicSubtype.moderator_warning
   end
 
   def include_is_warning?

db/migrate/20140908165716_migrate_warning_topic_subtypes.rb

@@ -0,0 +1,8 @@
+class MigrateWarningTopicSubtypes < ActiveRecord::Migration
+  def change
+    execute "UPDATE topics AS t
+              SET subtype = 'moderator_warning'
+              FROM warnings AS w
+              WHERE w.topic_id = t.id"
+  end
+end

lib/topic_creator.rb

@@ -75,6 +75,9 @@ class TopicCreator
       topic_params[key] = @opts[key] if @opts[key].present?
     end
 
+    # Automatically give it a moderator warning subtype if specified
+    topic_params[:subtype] = TopicSubtype.moderator_warning if @opts[:is_warning]
+
     category = find_category
 
     @guardian.ensure_can_create!(Topic, category)

lib/topic_query.rb

@@ -165,7 +165,7 @@ class TopicQuery
       options.reverse_merge!(per_page: SiteSetting.topics_per_page)
 
       # Start with a list of all topics
-      result = Topic.includes(:allowed_users).includes(:warning)
+      result = Topic.includes(:allowed_users)
                     .where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = #{user.id.to_i})")
                     .joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{user.id.to_i})")
                     .order(TopicQuerySQL.order_nocategory_basic_bumped)

spec/components/post_creator_spec.rb

@@ -354,6 +354,7 @@ describe PostCreator do
       post.topic.warning.should be_blank
 
       post.topic.archetype.should == Archetype.private_message
+      post.topic.subtype.should == TopicSubtype.user_to_user
       post.topic.topic_allowed_users.count.should == 3
 
       # PMs can't have a category
@@ -404,6 +405,7 @@ describe PostCreator do
       topic = post.topic
       topic.should be_present
       topic.warning.should be_present
+      topic.subtype.should == TopicSubtype.moderator_warning
       topic.warning.user.should == target_user1
       topic.warning.created_by.should == user
       target_user1.warnings.count.should == 1