Browse Source

Fix featured tags not finding the right tag on save (#11504)

Regression from f371b32
pull/4/head
Eugen Rochko 4 years ago
committed by GitHub
parent
commit
a8958d07e2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
  1. +6
    -1
      app/javascript/styles/mastodon/widgets.scss
  2. +1
    -1
      app/models/featured_tag.rb

+ 6
- 1
app/javascript/styles/mastodon/widgets.scss View File

@ -324,7 +324,8 @@
&.active h4 {
&,
.fa,
small {
small,
.trends__item__current {
color: $primary-text-color;
}
}
@ -337,6 +338,10 @@
&.active .avatar-stack .account__avatar {
border-color: $ui-highlight-color;
}
.trends__item__current {
padding-right: 0;
}
}
}

+ 1
- 1
app/models/featured_tag.rb View File

@ -23,7 +23,7 @@ class FeaturedTag < ApplicationRecord
validate :validate_featured_tags_limit, on: :create
def name=(str)
self.tag = Tag.find_or_initialize_by(name: str.strip.delete('#').mb_chars.downcase.to_s)
self.tag = Tag.find_or_create_by_names(str.strip)&.first
end
def increment(timestamp)

Loading…
Cancel
Save