Merge remote-tracking branch 'upstream/pull/3194'

[rails.git] / app / models / redaction.rb

diff --git a/app/models/redaction.rb b/app/models/redaction.rb
index ca0ea7232f02755a1e7ecee454c4a49c9ed2a683..f4eedde0a2daddb172843d910507494261c1b4ae 100644 (file)
--- a/app/models/redaction.rb
+++ b/app/models/redaction.rb
@@ -1,20 +1,43 @@
+# == Schema Information
+#
+# Table name: redactions
+#
+#  id                 :integer          not null, primary key
+#  title              :string
+#  description        :text
+#  created_at         :datetime
+#  updated_at         :datetime
+#  user_id            :bigint(8)        not null
+#  description_format :enum             default("markdown"), not null
+#
+# Foreign Keys
+#
+#  redactions_user_id_fkey  (user_id => users.id)
+#
+

 ##
 # Redaction represents a record associated with a particular
 # action on the database to hide revisions from the history
 ##
 # Redaction represents a record associated with a particular
 # action on the database to hide revisions from the history

-# which are not appropriate to redistribute any more. 
+# which are not appropriate to redistribute any more.

 #
 # The circumstances of the redaction can be recorded in the
 #
 # The circumstances of the redaction can be recorded in the

-# record's title and description fields, which can be 
+# record's title and description fields, which can be

 # displayed linked from the redacted records.
 #
 # displayed linked from the redacted records.
 #

-class Redaction < ActiveRecord::Base
+class Redaction < ApplicationRecord

   belongs_to :user
 
   has_many :old_nodes
   has_many :old_ways
   has_many :old_relations
 
   belongs_to :user
 
   has_many :old_nodes
   has_many :old_ways
   has_many :old_relations
 

+  validates :title, :presence => true, :characters => true
+  validates :description, :presence => true, :characters => true
+  validates :description_format, :inclusion => { :in => %w[text html markdown] }
+
+  # this method overrides the AR default to provide the rich
+  # text object for the description field.

   def description
   def description

-    RichText.new(read_attribute(:description_format), read_attribute(:description))
+    RichText.new(self[:description_format], self[:description])

   end
 end
   end
 end