mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-01 08:46:26 +01:00
Code Issues Projects Releases Wiki Activity

Add waiting time to list of pending accounts in admin UI (#10985)

Browse Source
This commit is contained in:
Eugen Rochko 2019-06-07 03:24:10 +02:00 committed by GitHub
parent c672676c03
commit a60364ca7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/accounts_controller.rb
View File

@ -48,13 +48,13 @@ module Admin
def approve def approve
authorize @account.user, :approve? authorize @account.user, :approve?
@account.user.approve! @account.user.approve!
redirect_to admin_accounts_path(pending: '1') redirect_to admin_pending_accounts_path
end end
def reject def reject
authorize @account.user, :reject? authorize @account.user, :reject?
SuspendAccountService.new.call(@account, including_user: true, destroy: true, skip_distribution: true) SuspendAccountService.new.call(@account, including_user: true, destroy: true, skip_distribution: true)
redirect_to admin_accounts_path(pending: '1') redirect_to admin_pending_accounts_path
end end
def unsilence def unsilence

2
app/views/admin/pending_accounts/_account.html.haml
View File

@ -8,6 +8,8 @@
= "(@#{account.username})" = "(@#{account.username})"
%br/ %br/
= account.user_current_sign_in_ip = account.user_current_sign_in_ip
•
= t 'admin.accounts.time_in_queue', time: time_ago_in_words(account.user&.created_at)
- if account.user&.invite_request&.text&.present? - if account.user&.invite_request&.text&.present?
.pending-account__body .pending-account__body

1
config/locales/en.yml
View File

@ -174,6 +174,7 @@ en:
statuses: Statuses statuses: Statuses
subscribe: Subscribe subscribe: Subscribe
suspended: Suspended suspended: Suspended
time_in_queue: Waiting in queue %{time}
title: Accounts title: Accounts
unconfirmed_email: Unconfirmed email unconfirmed_email: Unconfirmed email
undo_silenced: Undo silence undo_silenced: Undo silence