cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pinned statuses being shown in a featured hashtag (#9971)

This commit is contained in:
Eugen Rochko 2019-02-05 00:27:18 +01:00 committed by GitHub
parent e02a13f64e
commit 2557cb2f95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/accounts_controller.rb
View File

@ -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

2
app/controllers/settings/featured_tags_controller.rb
View File

@ -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

2
app/views/accounts/show.html.haml
View File

@ -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