Add order options to relationship manager UI (#10404)
parent
683013756e
commit
08ec7435ce
|
@ -31,13 +31,14 @@ class RelationshipsController < ApplicationController
|
|||
def relationships_scope
|
||||
scope = begin
|
||||
if following_relationship?
|
||||
current_account.following.joins(:account_stat)
|
||||
current_account.following.eager_load(:account_stat).reorder(nil)
|
||||
else
|
||||
current_account.followers.joins(:account_stat)
|
||||
current_account.followers.eager_load(:account_stat).reorder(nil)
|
||||
end
|
||||
end
|
||||
|
||||
scope.merge!(Follow.recent)
|
||||
scope.merge!(Follow.recent) if params[:order].blank? || params[:order] == 'recent'
|
||||
scope.merge!(Account.by_recent_status) if params[:order] == 'active'
|
||||
scope.merge!(mutual_relationship_scope) if mutual_relationship?
|
||||
scope.merge!(moved_account_scope) if params[:status] == 'moved'
|
||||
scope.merge!(primary_account_scope) if params[:status] == 'primary'
|
||||
|
@ -84,7 +85,7 @@ class RelationshipsController < ApplicationController
|
|||
end
|
||||
|
||||
def current_params
|
||||
params.slice(:page, :status, :relationship, :by_domain, :activity).permit(:page, :status, :relationship, :by_domain, :activity)
|
||||
params.slice(:page, :status, :relationship, :by_domain, :activity, :order).permit(:page, :status, :relationship, :by_domain, :activity, :order)
|
||||
end
|
||||
|
||||
def action_from_button
|
||||
|
|
|
@ -7,7 +7,7 @@ module Admin::FilterHelper
|
|||
CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze
|
||||
TAGS_FILTERS = %i(hidden).freeze
|
||||
INSTANCES_FILTERS = %i(limited by_domain).freeze
|
||||
FOLLOWERS_FILTERS = %i(relationship status by_domain activity).freeze
|
||||
FOLLOWERS_FILTERS = %i(relationship status by_domain activity order).freeze
|
||||
|
||||
FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS + FOLLOWERS_FILTERS
|
||||
|
||||
|
|
|
@ -25,11 +25,18 @@
|
|||
%li= filter_link_to t('generic.all'), activity: nil
|
||||
%li= filter_link_to t('relationships.dormant'), activity: 'dormant'
|
||||
|
||||
.filter-subset
|
||||
%strong= t 'generic.order_by'
|
||||
%ul
|
||||
%li= filter_link_to t('relationships.most_recent'), order: nil
|
||||
%li= filter_link_to t('relationships.last_active'), order: 'active'
|
||||
|
||||
= form_for(@form, url: relationships_path, method: :patch) do |f|
|
||||
= hidden_field_tag :page, params[:page] || 1
|
||||
= hidden_field_tag :relationship, params[:relationship]
|
||||
= hidden_field_tag :status, params[:status]
|
||||
= hidden_field_tag :activity, params[:activity]
|
||||
= hidden_field_tag :order, params[:order]
|
||||
|
||||
.batch-table
|
||||
.batch-table__toolbar
|
||||
|
|
|
@ -774,6 +774,8 @@ en:
|
|||
relationships:
|
||||
activity: Account activity
|
||||
dormant: Dormant
|
||||
last_active: Last active
|
||||
most_recent: Most recent
|
||||
moved: Moved
|
||||
mutual: Mutual
|
||||
primary: Primary
|
||||
|
|
Reference in New Issue