Browse Source

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

pull/4/head
Eugen Rochko 4 years ago
committed by GitHub
parent
commit
a60364ca7d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
  1. +2
    -2
      app/controllers/admin/accounts_controller.rb
  2. +2
    -0
      app/views/admin/pending_accounts/_account.html.haml
  3. +1
    -0
      config/locales/en.yml

+ 2
- 2
app/controllers/admin/accounts_controller.rb View File

@ -48,13 +48,13 @@ module Admin
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

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

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

+ 1
- 0
config/locales/en.yml View File

@ -174,6 +174,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

Loading…
Cancel
Save