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

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

diff --git a/app/models/redaction.rb b/app/models/redaction.rb
index d9a5c6cd793091fd893facd7b8130c1af2bc2473..5e9e0decde935a87b1514e3a8ffec16085026b79 100644 (file)
--- a/app/models/redaction.rb
+++ b/app/models/redaction.rb
@@ -3,8 +3,8 @@
 # Table name: redactions
 #
 #  id                 :integer          not null, primary key
 # Table name: redactions
 #
 #  id                 :integer          not null, primary key

-#  title              :string
-#  description        :text
+#  title              :string           not null
+#  description        :text             not null

 #  created_at         :datetime
 #  updated_at         :datetime
 #  user_id            :bigint(8)        not null
 #  created_at         :datetime
 #  updated_at         :datetime
 #  user_id            :bigint(8)        not null


@@ -24,15 +24,15 @@
 # record's title and description fields, which can be
 # displayed linked from the redacted records.
 #
 # record's title and description fields, which can be
 # 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, :description, :invalid_chars => true
-  validates :description, :presence => true
+  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
   validates :description_format, :inclusion => { :in => %w[text html markdown] }
 
   # this method overrides the AR default to provide the rich