use tag name validator for artist names #3328
This commit is contained in:
@@ -8,7 +8,7 @@ class Artist < ApplicationRecord
|
||||
after_save :categorize_tag
|
||||
after_save :update_wiki
|
||||
validates_uniqueness_of :name
|
||||
validate :validate_name
|
||||
validates :name, tag_name: true
|
||||
validate :validate_wiki, :on => :create
|
||||
after_validation :merge_validation_errors
|
||||
belongs_to :creator, :class_name => "User"
|
||||
@@ -119,18 +119,6 @@ class Artist < ApplicationRecord
|
||||
end
|
||||
end
|
||||
|
||||
def validate_name
|
||||
if name =~ /^[-~]/
|
||||
errors[:name] << "cannot begin with - or ~"
|
||||
false
|
||||
elsif name =~ /\*/
|
||||
errors[:name] << "cannot contain *"
|
||||
false
|
||||
else
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
def normalize_name
|
||||
self.name = Artist.normalize_name(name)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user