Simplify "report a problem" control

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

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index 6f1bf0388a5c0bd3417c8a52fada295dcb838e77..5f2f9efc9107036fef2bb97b244d63325c1efe15 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -3,9 +3,8 @@ class NodeTag < ActiveRecord::Base
   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