X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/497009ed2b98dfdeeb349e891c1fbd88d14ff087..2a2a204125383729223083f203a04e9e6eff873d:/app/models/redaction.rb diff --git a/app/models/redaction.rb b/app/models/redaction.rb index a9bdf5580..49de3177a 100644 --- a/app/models/redaction.rb +++ b/app/models/redaction.rb @@ -1,10 +1,10 @@ ## # 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 -# record's title and description fields, which can be +# record's title and description fields, which can be # displayed linked from the redacted records. # class Redaction < ActiveRecord::Base @@ -14,9 +14,12 @@ class Redaction < ActiveRecord::Base has_many :old_ways has_many :old_relations - # this method overrides the AR default to provide the rich + validates :description, :presence => 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 - RichText.new(read_attribute(:description_format), read_attribute(:description)) + RichText.new(self[:description_format], self[:description]) end end