Don't allow percent signs in usernames

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

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index 4942601128d908c7d1fc4306d02fb51c98f9883e..6f1bf0388a5c0bd3417c8a52fada295dcb838e77 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -1,10 +1,11 @@
 class NodeTag < ActiveRecord::Base
-  set_table_name 'current_node_tags'
+  self.table_name = "current_node_tags"
+  self.primary_keys = "node_id", "k"
 
-  belongs_to :node, :foreign_key => 'id'
+  belongs_to :node
   
-  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
+  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
 end