Merge pull request #4173 from AntonKhorev/comments

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

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index d1e80059232980373c6b1c18daeb10db458e7a4d..d76a1a0ae865a7e8e86cd3f8c93e3c87c75a1928 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -11,13 +11,13 @@
 #  current_node_tags_id_fkey  (node_id => current_nodes.id)
 #
 
-class NodeTag < ActiveRecord::Base
+class NodeTag < ApplicationRecord
   self.table_name = "current_node_tags"
   self.primary_keys = "node_id", "k"
 
   belongs_to :node
 
-  validates :node, :presence => true, :associated => true
-  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :invalid_chars => true
+  validates :node, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
   validates :k, :uniqueness => { :scope => :node_id }
 end