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

1 files changed, 1 insertions, 6 deletions

diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb
index 0ef5d18bd..f1f1a0d70 100644
--- a/app/models/censor_rule.rb
+++ b/app/models/censor_rule.rb
@@ -23,6 +23,7 @@
 # Email: hello@mysociety.org; WWW: http://www.mysociety.org/
 
 class CensorRule < ActiveRecord::Base
+    include AdminColumn
     belongs_to :info_request
     belongs_to :user
     belongs_to :public_body
@@ -58,12 +59,6 @@ class CensorRule < ActiveRecord::Base
         binary_to_censor.gsub!(to_replace) { |match| match.gsub(/./, 'x') }
     end
 
-    def for_admin_column
-        self.class.content_columns.each do |column|
-          yield(column.human_name, send(column.name), column.type.to_s, column.name)
-        end
-    end
-
     def is_global?
         info_request_id.nil? && user_id.nil? && public_body_id.nil?
     end