Merge remote-tracking branch 'jpmckinney_github/extract_method2' into rails-3-develop

1 files changed, 3 insertions, 7 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 65099b1c4..38627df50 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -28,8 +28,11 @@
 require 'digest/sha1'
 
 class InfoRequest < ActiveRecord::Base
+    include AdminColumn
     include Rails.application.routes.url_helpers
 
+    @non_admin_columns = %w(title url_title)
+
     strip_attributes!
 
     validates_presence_of :title, :message => N_("Please enter a summary of your request")
@@ -1282,13 +1285,6 @@ public
         PublicBody.set_callback(:save, :after, :purge_in_cache)
     end
 
-    def for_admin_column
-      self.class.content_columns.map{|c| c unless %w(title url_title).include?(c.name) }.compact.each do |column|
-        yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
-      end
-    end
-
-
     # Get requests that have similar important terms
     def similar_requests(limit=10)
         xapian_similar = nil