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

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

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index bd0417ab4255af3a32ff6a56b4a895a3460a02ee..7ffba0dc3350c0348c094d4b7ddd0e8893fbeea4 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -1,10 +1,9 @@
 class ChangesetTag < ActiveRecord::Base
 class ChangesetTag < ActiveRecord::Base

-  set_primary_keys :changeset_id, :k
+  self.primary_keys = "changeset_id", "k"

 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

-  validates_presence_of :changeset
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => :changeset_id
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+  validates :changeset, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :changeset_id }

 end
 end