Fix pinned statuses being shown in a featured hashtag (#9971)
parent
e02a13f64e
commit
2557cb2f95
|
@ -52,7 +52,7 @@ class AccountsController < ApplicationController
|
||||||
private
|
private
|
||||||
|
|
||||||
def show_pinned_statuses?
|
def show_pinned_statuses?
|
||||||
[replies_requested?, media_requested?, params[:max_id].present?, params[:min_id].present?].none?
|
[replies_requested?, media_requested?, tag_requested?, params[:max_id].present?, params[:min_id].present?].none?
|
||||||
end
|
end
|
||||||
|
|
||||||
def filtered_statuses
|
def filtered_statuses
|
||||||
|
|
|
@ -38,7 +38,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_featured_tags
|
def set_featured_tags
|
||||||
@featured_tags = current_account.featured_tags.reject(&:new_record?)
|
@featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?)
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_most_used_tags
|
def set_most_used_tags
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
- @endorsed_accounts.each do |account|
|
- @endorsed_accounts.each do |account|
|
||||||
= account_link_to account
|
= account_link_to account
|
||||||
|
|
||||||
- @account.featured_tags.each do |featured_tag|
|
- @account.featured_tags.order(statuses_count: :desc).each do |featured_tag|
|
||||||
.directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil }
|
.directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil }
|
||||||
= link_to short_account_tag_path(@account, featured_tag.tag) do
|
= link_to short_account_tag_path(@account, featured_tag.tag) do
|
||||||
%h4
|
%h4
|
||||||
|
|
Loading…
Reference in New Issue