Merge branch 'master' into openid

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

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index de3d0629c4d29ce5769aa8f7ede0c65f020a9758..4942601128d908c7d1fc4306d02fb51c98f9883e 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -4,5 +4,7 @@ class NodeTag < ActiveRecord::Base
   belongs_to :node, :foreign_key => 'id'
   
   validates_presence_of :id
-  validates_length_of :k, :v, :within => 0..255, :allow_blank => true
+  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
+  validates_uniqueness_of :id, :scope => :k
+  validates_numericality_of :id, :only_integer => true
 end