X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fc25c3d412829774abf0454e4dcc92e41f47454c..5b33f3f8e31c62bc3e5db1d5b120533c3afdde68:/app/models/node_tag.rb

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index 6bc1c555e..5f2f9efc9 100644
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -1,11 +1,10 @@
 class NodeTag < ActiveRecord::Base
-  set_table_name 'current_node_tags'
-  set_primary_keys :node_id, :k
+  self.table_name = "current_node_tags"
+  self.primary_keys = "node_id", "k"
 
   belongs_to :node
-  
-  validates_presence_of :node
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => :node_id
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+
+  validates :node, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => :node_id }
 end