diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-07 03:24:10 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-11-19 16:38:32 -0600 |
| commit | 23d379e0076e91e5651968b7af92178ba976988b (patch) | |
| tree | c23b7e4cc848efdc964b049114f800d0283312b4 | |
| parent | 968de2cfc281216ec41ba5673b5cfb52c66006f7 (diff) | |
Add waiting time to list of pending accounts in admin UI (#10985)
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/admin/pending_accounts/_account.html.haml | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index 9054a8aca..a62eb6477 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -36,13 +36,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 mark_unknown diff --git a/app/views/admin/pending_accounts/_account.html.haml b/app/views/admin/pending_accounts/_account.html.haml index 1ed5dafdd..7a9796a67 100644 --- a/app/views/admin/pending_accounts/_account.html.haml +++ b/app/views/admin/pending_accounts/_account.html.haml @@ -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 diff --git a/config/locales/en.yml b/config/locales/en.yml index 51f2406d8..873a1e666 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -188,6 +188,7 @@ en: statuses: Statuses subscribe: Subscribe suspended: Suspended + time_in_queue: Waiting in queue %{time} title: Accounts unconfirmed_email: Unconfirmed email allow_nonsensitive: Allow non-sensitive |