mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-24 23:26:31 +09:00
Code

Fix featured tag form not failing on failed tag validations (#10167)

Browse Source
This commit is contained in:
Eugen Rochko 2019-03-05 03:46:24 +01:00 committed by GitHub
parent 05dfd632c7
commit 5d3e7cee99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/featured_tag.rb
View File

@ -18,11 +18,12 @@ class FeaturedTag < ApplicationRecord
delegate :name, to: :tag, allow_nil: true delegate :name, to: :tag, allow_nil: true
validates :name, presence: true validates_associated :tag, on: :create
validates :name, presence: true, on: :create
validate :validate_featured_tags_limit, on: :create validate :validate_featured_tags_limit, on: :create
def name=(str) def name=(str)
self.tag = Tag.find_or_initialize_by(name: str.delete('#').mb_chars.downcase.to_s) self.tag = Tag.find_or_initialize_by(name: str.strip.delete('#').mb_chars.downcase.to_s)
end end
def increment(timestamp) def increment(timestamp)