specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Fix error on account relationships page in admin UI (#17444)

Browse source
This commit is contained in:
Eugen Rochko 2022-02-05 05:06:34 +01:00 committed by GitHub
parent 6a649e9131
commit e03e7ac290
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/admin/relationships_controller.rb
View file

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

23
app/views/admin/relationships/index.html.haml
View file

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