Merge oauth branch at r17138 to trunk.

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

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