Reorder auth_success handlers

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

diff --git a/app/models/redaction.rb b/app/models/redaction.rb
index b3c5ec5ba6753469a8b87c9cf6bb6af0fb4c36e0..49de3177a127af1a0bbe260aaf1feaa15b716109 100644 (file)
--- a/app/models/redaction.rb
+++ b/app/models/redaction.rb
@@ -14,9 +14,12 @@ class Redaction < ActiveRecord::Base
   has_many :old_ways
   has_many :old_relations
 
+  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