Merge remote-tracking branch 'openstreetmap/pull/1043'

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

diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb
index c665cfef66e0fb19896731d29776d3695715b153..382606795cab0416326971239a393173edb6c491 100644 (file)
--- a/app/models/relation_tag.rb
+++ b/app/models/relation_tag.rb
@@ -4,8 +4,7 @@ class RelationTag < ActiveRecord::Base
 
   belongs_to :relation
 
-  validates_presence_of :relation
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => :relation_id
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+  validates :relation, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :relation_id }
 end