forked from treehouse/mastodon
Fix error on account relationships page in admin UI (#17444)
parent
6a649e9131
commit
e03e7ac290
|
@ -9,7 +9,8 @@ module Admin
|
||||||
def index
|
def index
|
||||||
authorize :account, :index?
|
authorize :account, :index?
|
||||||
|
|
||||||
@accounts = RelationshipFilter.new(@account, filter_params).results.page(params[:page]).per(PER_PAGE)
|
@accounts = RelationshipFilter.new(@account, filter_params).results.includes(:account_stat, user: [:ips, :invite_request]).page(params[:page]).per(PER_PAGE)
|
||||||
|
@form = Form::AccountBatch.new
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -24,16 +24,17 @@
|
||||||
|
|
||||||
%hr.spacer/
|
%hr.spacer/
|
||||||
|
|
||||||
.table-wrapper
|
= form_for(@form, url: batch_admin_accounts_path) do |f|
|
||||||
%table.table
|
.batch-table
|
||||||
%thead
|
.batch-table__toolbar
|
||||||
%tr
|
%label.batch-table__toolbar__select.batch-checkbox-all
|
||||||
%th= t('admin.accounts.username')
|
= check_box_tag :batch_checkbox_all, nil, false
|
||||||
%th= t('admin.accounts.role')
|
.batch-table__toolbar__actions
|
||||||
%th= t('admin.accounts.most_recent_ip')
|
= f.button safe_join([fa_icon('lock'), t('admin.accounts.perform_full_suspension')]), name: :suspend, class: 'table-action-link', type: :submit, data: { confirm: t('admin.reports.are_you_sure') }
|
||||||
%th= t('admin.accounts.most_recent_activity')
|
.batch-table__body
|
||||||
%th
|
- if @accounts.empty?
|
||||||
%tbody
|
= nothing_here 'nothing-here--under-tabs'
|
||||||
= render partial: 'admin/accounts/account', collection: @accounts
|
- else
|
||||||
|
= render partial: 'admin/accounts/account', collection: @accounts, locals: { f: f }
|
||||||
|
|
||||||
= paginate @accounts
|
= paginate @accounts
|
||||||
|
|
Loading…
Reference in New Issue