Skip to content

Commit

Permalink
Add waiting time to list of pending accounts in admin UI (mastodon#10985
Browse files Browse the repository at this point in the history
)
  • Loading branch information
Gargron authored and hiyuki2578 committed Oct 2, 2019
1 parent e42aca9 commit fc4995f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/controllers/admin/accounts_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ def enable
def approve
authorize @account.user, :approve?
@account.user.approve!
redirect_to admin_accounts_path(pending: '1')
redirect_to admin_pending_accounts_path
end

def reject
authorize @account.user, :reject?
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

def unsilence
Expand Down
2 changes: 2 additions & 0 deletions app/views/admin/pending_accounts/_account.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
= "(@#{account.username})"
%br/
= 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?
.pending-account__body
Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ en:
statuses: Statuses
subscribe: Subscribe
suspended: Suspended
time_in_queue: Waiting in queue %{time}
title: Accounts
unconfirmed_email: Unconfirmed email
undo_silenced: Undo silence
Expand Down

0 comments on commit fc4995f

Please sign in to comment.